yaffs Fixed some tests in direct/timothy_tests/quick_tests

Signed-off-by: Timothy Manning <tfhmanning@gmail.com>

diff --git a/direct/timothy_tests/quick_tests/README.txt b/direct/timothy_tests/quick_tests/README.txt
index a2a08ff1cd2efbd79dc2c2ae32547c0c5f3c2bb7..97dd42db9db77d4cd559ec38a21a1b6dfaeb446b 100644 (file)
--- a/direct/timothy_tests/quick_tests/README.txt
+++ b/direct/timothy_tests/quick_tests/README.txt
@@ -7,101 +7,95 @@ Tests made
 test_yaffs_access.c
 test_yaffs_access_EINVAL.c
 test_yaffs_access_ELOOP.c
 test_yaffs_access.c
 test_yaffs_access_EINVAL.c
 test_yaffs_access_ELOOP.c

+test_yaffs_access_ELOOP_dir.c

 test_yaffs_access_ENOENT2.c
 test_yaffs_access_ENOENT.c
 test_yaffs_access_ENOTDIR.c
 test_yaffs_access_ENOENT2.c
 test_yaffs_access_ENOENT.c
 test_yaffs_access_ENOTDIR.c

-
+test_yaffs_access_EROFS.c

 test_yaffs_chmod.c
 test_yaffs_chmod_EINVAL.c
 test_yaffs_chmod_ELOOP.c
 test_yaffs_chmod.c
 test_yaffs_chmod_EINVAL.c
 test_yaffs_chmod_ELOOP.c

+test_yaffs_chmod_ELOOP_dir.c

 test_yaffs_chmod_ENOENT2.c
 test_yaffs_chmod_ENOENT.c
 test_yaffs_chmod_ENOTDIR.c
 test_yaffs_chmod_ENOENT2.c
 test_yaffs_chmod_ENOENT.c
 test_yaffs_chmod_ENOTDIR.c

-
+test_yaffs_chmod_EROFS.c

 test_yaffs_close.c
 test_yaffs_close_EBADF.c
 test_yaffs_close.c
 test_yaffs_close_EBADF.c

-

 test_yaffs_fchmod.c
 test_yaffs_fchmod_EBADF.c
 test_yaffs_fchmod_EINVAL.c
 test_yaffs_fchmod.c
 test_yaffs_fchmod_EBADF.c
 test_yaffs_fchmod_EINVAL.c

-
+test_yaffs_fchmod_EROFS.c

 test_yaffs_fdatasync.c
 test_yaffs_fdatasync_EBADF.c
 test_yaffs_fdatasync.c
 test_yaffs_fdatasync_EBADF.c

-
-test_yaffs_flush
-test_yaffs_flush_EBADF 
-
+test_yaffs_fdatasync_EROFS.c
+test_yaffs_flush.c
+test_yaffs_flush_EBADF.c
+test_yaffs_flush_EROFS.c

 test_yaffs_freespace.c
 test_yaffs_freespace_EINVAL.c
 test_yaffs_freespace.c
 test_yaffs_freespace_EINVAL.c

-

 test_yaffs_fstat.c
 test_yaffs_fstat_EBADF.c
 test_yaffs_fstat.c
 test_yaffs_fstat_EBADF.c

-

 test_yaffs_fsync.c
 test_yaffs_fsync_EBADF.c
 test_yaffs_fsync.c
 test_yaffs_fsync_EBADF.c

-
+test_yaffs_fsync_EROFS.c

 test_yaffs_ftruncate_big_file.c
 test_yaffs_ftruncate.c
 test_yaffs_ftruncate_EBADF.c
 test_yaffs_ftruncate_EINVAL.c
 test_yaffs_ftruncate_big_file.c
 test_yaffs_ftruncate.c
 test_yaffs_ftruncate_EBADF.c
 test_yaffs_ftruncate_EINVAL.c

-
+test_yaffs_ftruncate_EROFS.c

 test_yaffs_inodecount.c
 test_yaffs_inodecount_EINVAL.c
 test_yaffs_inodecount.c
 test_yaffs_inodecount_EINVAL.c

-

 test_yaffs_link.c
 test_yaffs_link_EEXIST.c
 test_yaffs_link.c
 test_yaffs_link_EEXIST.c

+test_yaffs_link_ELOOP_dir.c

 test_yaffs_link_ENOENT2.c
 test_yaffs_link_ENOENT3.c
 test_yaffs_link_ENOENT4.c
 test_yaffs_link_ENOENT.c
 test_yaffs_link_ENOTDIR2.c
 test_yaffs_link_ENOTDIR.c
 test_yaffs_link_ENOENT2.c
 test_yaffs_link_ENOENT3.c
 test_yaffs_link_ENOENT4.c
 test_yaffs_link_ENOENT.c
 test_yaffs_link_ENOTDIR2.c
 test_yaffs_link_ENOTDIR.c

-
+test_yaffs_link_EROFS.c

 test_yaffs_lseek_big_file.c
 test_yaffs_lseek.c
 test_yaffs_lseek_EBADF.c
 test_yaffs_lseek_EINVAL.c
 test_yaffs_lseek_big_file.c
 test_yaffs_lseek.c
 test_yaffs_lseek_EBADF.c
 test_yaffs_lseek_EINVAL.c

-
+test_yaffs_lseek_EROFS.c

 test_yaffs_lstat.c
 test_yaffs_lstat_ENOENT.c
 test_yaffs_lstat_ENOTDIR.c
 test_yaffs_lstat.c
 test_yaffs_lstat_ENOENT.c
 test_yaffs_lstat_ENOTDIR.c

-

 test_yaffs_mkdir.c
 test_yaffs_mkdir_EEXIST.c
 test_yaffs_mkdir.c
 test_yaffs_mkdir_EEXIST.c

+test_yaffs_mkdir_ELOOP_dir.c

 test_yaffs_mkdir_ENOENT.c
 test_yaffs_mkdir_ENOTDIR.c
 test_yaffs_mkdir_ENOENT.c
 test_yaffs_mkdir_ENOTDIR.c

-
-test_yaffs_mknode.c
-
+test_yaffs_mkdir_EROFS.c

 test_yaffs_mount2.c
 test_yaffs_mount2_ENODEV.c
 test_yaffs_mount2.c
 test_yaffs_mount2_ENODEV.c

-

 test_yaffs_mount.c
 test_yaffs_mount_EBUSY.c
 test_yaffs_mount_ENAMETOOLONG.c
 test_yaffs_mount_ENODEV.c
 test_yaffs_mount.c
 test_yaffs_mount_EBUSY.c
 test_yaffs_mount_ENAMETOOLONG.c
 test_yaffs_mount_ENODEV.c

-

 test_yaffs_open.c
 test_yaffs_open_EEXIST.c
 test_yaffs_open_EINVAL2.c
 test_yaffs_open_EINVAL.c
 test_yaffs_open_EISDIR.c
 test_yaffs_open_ELOOP.c
 test_yaffs_open.c
 test_yaffs_open_EEXIST.c
 test_yaffs_open_EINVAL2.c
 test_yaffs_open_EINVAL.c
 test_yaffs_open_EISDIR.c
 test_yaffs_open_ELOOP.c

+test_yaffs_open_ELOOP_dir.c

 test_yaffs_open_ENAMETOOLONG.c
 test_yaffs_open_ENOENT.c
 test_yaffs_open_ENOTDIR.c
 test_yaffs_open_ENAMETOOLONG.c
 test_yaffs_open_ENOENT.c
 test_yaffs_open_ENOTDIR.c

-
+test_yaffs_open_EROFS.c

 test_yaffs_read.c
 test_yaffs_read_EBADF.c
 test_yaffs_read_EINVAL.c
 test_yaffs_read.c
 test_yaffs_read_EBADF.c
 test_yaffs_read_EINVAL.c

-

 test_yaffs_remount_EINVAL.c
 test_yaffs_remount_ENODEV.c
 test_yaffs_remount_force_off_read_only_off.c
 test_yaffs_remount_force_off_read_only_on.c
 test_yaffs_remount_force_on_read_only_off.c
 test_yaffs_remount_force_on_read_only_on.c
 test_yaffs_remount_EINVAL.c
 test_yaffs_remount_ENODEV.c
 test_yaffs_remount_force_off_read_only_off.c
 test_yaffs_remount_force_off_read_only_on.c
 test_yaffs_remount_force_on_read_only_off.c
 test_yaffs_remount_force_on_read_only_on.c

-

 test_yaffs_rename.c
 test_yaffs_rename_dir.c
 test_yaffs_rename_dir_ENOENT2.c
 test_yaffs_rename.c
 test_yaffs_rename_dir.c
 test_yaffs_rename_dir_ENOENT2.c


@@ -110,51 +104,54 @@ test_yaffs_rename_dir_not_empty.c
 test_yaffs_rename_dir_to_file.c
 test_yaffs_rename_EEXISTS.c
 test_yaffs_rename_EINVAL.c
 test_yaffs_rename_dir_to_file.c
 test_yaffs_rename_EEXISTS.c
 test_yaffs_rename_EINVAL.c

-test_yaffs_rename_ELOOP.c
+test_yaffs_rename_ELOOP_dir.c

 test_yaffs_rename_ENOENT.c
 test_yaffs_rename_ENOTDIR.c
 test_yaffs_rename_ENOENT.c
 test_yaffs_rename_ENOTDIR.c

+test_yaffs_rename_EROFS.c

 test_yaffs_rename_file_to_dir.c
 test_yaffs_rename_file_to_dir.c

-

 test_yaffs_rmdir.c
 test_yaffs_rmdir_EBUSY.c
 test_yaffs_rmdir_EINVAL.c
 test_yaffs_rmdir.c
 test_yaffs_rmdir_EBUSY.c
 test_yaffs_rmdir_EINVAL.c

+test_yaffs_rmdir_ELOOP_dir.c

 test_yaffs_rmdir_ENOENT.c
 test_yaffs_rmdir_ENOTDIR.c
 test_yaffs_rmdir_ENOENT.c
 test_yaffs_rmdir_ENOTDIR.c

-
+test_yaffs_rmdir_EROFS.c

 test_yaffs_stat.c
 test_yaffs_stat_ELOOP.c
 test_yaffs_stat.c
 test_yaffs_stat_ELOOP.c

+test_yaffs_stat_ELOOP_dir.c

 test_yaffs_stat_ENOENT2.c
 test_yaffs_stat_ENOENT.c
 test_yaffs_stat_ENOTDIR.c
 test_yaffs_stat_ENOENT2.c
 test_yaffs_stat_ENOENT.c
 test_yaffs_stat_ENOTDIR.c

-

 test_yaffs_symlink.c
 test_yaffs_symlink_EEXIST.c
 test_yaffs_symlink.c
 test_yaffs_symlink_EEXIST.c

+test_yaffs_symlink_ELOOP_dir.c

 test_yaffs_symlink_ENOENT2.c
 test_yaffs_symlink_ENOENT.c
 test_yaffs_symlink_ENOTDIR.c
 test_yaffs_symlink_ENOENT2.c
 test_yaffs_symlink_ENOENT.c
 test_yaffs_symlink_ENOTDIR.c

-
+test_yaffs_symlink_EROFS.c

 test_yaffs_sync.c
 test_yaffs_sync_ENODEV.c
 test_yaffs_sync.c
 test_yaffs_sync_ENODEV.c

-
+test_yaffs_sync_EROFS.c

 test_yaffs_totalspace.c
 test_yaffs_totalspace_EINVAL.c
 test_yaffs_totalspace.c
 test_yaffs_totalspace_EINVAL.c

-

 test_yaffs_truncate_big_file.c
 test_yaffs_truncate.c
 test_yaffs_truncate_EINVAL.c
 test_yaffs_truncate_EISDIR.c
 test_yaffs_truncate_ELOOP.c
 test_yaffs_truncate_big_file.c
 test_yaffs_truncate.c
 test_yaffs_truncate_EINVAL.c
 test_yaffs_truncate_EISDIR.c
 test_yaffs_truncate_ELOOP.c

+test_yaffs_truncate_ELOOP_dir.c

 test_yaffs_truncate_ENOENT2.c
 test_yaffs_truncate_ENOENT.c
 test_yaffs_truncate_ENOTDIR.c
 test_yaffs_truncate_ENOENT2.c
 test_yaffs_truncate_ENOENT.c
 test_yaffs_truncate_ENOTDIR.c

-
+test_yaffs_truncate_EROFS.c

 test_yaffs_unlink.c
 test_yaffs_unlink_EISDIR.c
 test_yaffs_unlink.c
 test_yaffs_unlink_EISDIR.c

+test_yaffs_unlink_ELOOP_dir.c

 test_yaffs_unlink_ENAMETOOLONG.c
 test_yaffs_unlink_ENOENT2.c
 test_yaffs_unlink_ENOENT.c
 test_yaffs_unlink_ENOTDIR.c
 test_yaffs_unlink_ENAMETOOLONG.c
 test_yaffs_unlink_ENOENT2.c
 test_yaffs_unlink_ENOENT.c
 test_yaffs_unlink_ENOTDIR.c

-
+test_yaffs_unlink_EROFS.c

 test_yaffs_unmount2.c
 test_yaffs_unmount2_EINVAL.c
 test_yaffs_unmount2_ENODEV.c
 test_yaffs_unmount2.c
 test_yaffs_unmount2_EINVAL.c
 test_yaffs_unmount2_ENODEV.c


@@ -164,10 +161,11 @@ test_yaffs_unmount.c
 test_yaffs_unmount_EBUSY.c
 test_yaffs_unmount_ENAMETOOLONG.c
 test_yaffs_unmount_ENODEV.c
 test_yaffs_unmount_EBUSY.c
 test_yaffs_unmount_ENAMETOOLONG.c
 test_yaffs_unmount_ENODEV.c

-

 test_yaffs_write_big_file.c
 test_yaffs_write.c
 test_yaffs_write_EBADF.c
 test_yaffs_write_big_file.c
 test_yaffs_write.c
 test_yaffs_write_EBADF.c

+test_yaffs_write_EROFS.c
+

 
 
 Tests to add
 
 
 Tests to add


@@ -191,12 +189,12 @@ Tests to add
        
        test_yaffs_mkdir_EACCES
        test_yaffs_mkdir_ENAMETOOLONG
        
        test_yaffs_mkdir_EACCES
        test_yaffs_mkdir_ENAMETOOLONG

-       test_yaffs_mkdir_EROFS
+

 
 
        test_yaffs_symlink_EACCES
        test_yaffs_symlink_ENAMETOOLONG
 
 
        test_yaffs_symlink_EACCES
        test_yaffs_symlink_ENAMETOOLONG

-       test_yaffs_symlink_EROFS
+

 
        test_yaffs_mount2_ENAMETOOLONG
        test_yaffs_mount2_with read only set
 
        test_yaffs_mount2_ENAMETOOLONG
        test_yaffs_mount2_with read only set


@@ -222,12 +220,12 @@ Tests to add
 
        test_yaffs_link_ENAMETOOLONG
        test_yaffs_link_EPERM
 
        test_yaffs_link_ENAMETOOLONG
        test_yaffs_link_EPERM

-       test_yaffs_link_EROFS
+

 
 
        test_yaffs_rmdir_EACCES
        test_yaffs_rmdir_ENOTEMPTY
 
 
        test_yaffs_rmdir_EACCES
        test_yaffs_rmdir_ENOTEMPTY

-       test_yaffs_rmdir_EROFS
+

 
 
 
 
 
 


@@ -235,7 +233,7 @@ Tests to add
        test_yaffs_rename_EACCES
        test_yaffs_rename_EMLINK
        test_yaffs_rename_EEXISTS or EPERM
        test_yaffs_rename_EACCES
        test_yaffs_rename_EMLINK
        test_yaffs_rename_EEXISTS or EPERM

-       test_yaffs_rename_EROFS
+

 
        test_yaffs_dup
        test_yaffs_dup_EBADF            
 
        test_yaffs_dup
        test_yaffs_dup_EBADF            

diff --git a/direct/timothy_tests/quick_tests/quick_tests.h b/direct/timothy_tests/quick_tests/quick_tests.h
index 017b4ab9fe03b6c1962294cd88facdcde81c5519..67f562ebb73b565d73f5a647fb60e2b89ea1e2bc 100644 (file)
--- a/direct/timothy_tests/quick_tests/quick_tests.h
+++ b/direct/timothy_tests/quick_tests/quick_tests.h
@@ -336,7 +336,7 @@ test_template test_list[]={
        {test_yaffs_mkdir_ENOENT,test_yaffs_mkdir_ENOENT_clean,"test_yaffs_mkdir_ENOENT"},
        {test_yaffs_mkdir_ELOOP_dir,test_yaffs_mkdir_ELOOP_dir_clean,"test_yaffs_mkdir_ELOOP_dir"},
        {test_yaffs_mkdir_EROFS,test_yaffs_mkdir_EROFS_clean,"test_yaffs_mkdir_EROFS"},
        {test_yaffs_mkdir_ENOENT,test_yaffs_mkdir_ENOENT_clean,"test_yaffs_mkdir_ENOENT"},
        {test_yaffs_mkdir_ELOOP_dir,test_yaffs_mkdir_ELOOP_dir_clean,"test_yaffs_mkdir_ELOOP_dir"},
        {test_yaffs_mkdir_EROFS,test_yaffs_mkdir_EROFS_clean,"test_yaffs_mkdir_EROFS"},

-       {test_yaffs_rename_EROFS,test_yaffs_rename_EROFS_clean,"test_yaffs_rename_EROFS"},
+

 
        {test_yaffs_symlink,test_yaffs_symlink_clean,"test_yaffs_symlink"},
        {test_yaffs_symlink_ENOTDIR,test_yaffs_symlink_ENOTDIR_clean,"test_yaffs_symlink_ENOTDIR"},
 
        {test_yaffs_symlink,test_yaffs_symlink_clean,"test_yaffs_symlink"},
        {test_yaffs_symlink_ENOTDIR,test_yaffs_symlink_ENOTDIR_clean,"test_yaffs_symlink_ENOTDIR"},


@@ -407,6 +407,7 @@ test_template test_list[]={
        {test_yaffs_rename_file_to_dir,test_yaffs_rename_file_to_dir_clean,"test_yaffs_rename_file_to_dir"},
        {test_yaffs_rename_EEXISTS,test_yaffs_rename_EEXISTS_clean,"test_yaffs_rename_EEXISTS"},
        {test_yaffs_rename_ELOOP_dir,test_yaffs_rename_ELOOP_dir_clean,"test_yaffs_rename_ELOOP_dir"},
        {test_yaffs_rename_file_to_dir,test_yaffs_rename_file_to_dir_clean,"test_yaffs_rename_file_to_dir"},
        {test_yaffs_rename_EEXISTS,test_yaffs_rename_EEXISTS_clean,"test_yaffs_rename_EEXISTS"},
        {test_yaffs_rename_ELOOP_dir,test_yaffs_rename_ELOOP_dir_clean,"test_yaffs_rename_ELOOP_dir"},

+       {test_yaffs_rename_EROFS,test_yaffs_rename_EROFS_clean,"test_yaffs_rename_EROFS"},

 
        {test_yaffs_lstat,test_yaffs_lstat_clean,"test_yaffs_lstat"},
        {test_yaffs_lstat_ENOENT,test_yaffs_lstat_ENOENT_clean,"test_yaffs_lstat_ENOENT"},
 
        {test_yaffs_lstat,test_yaffs_lstat_clean,"test_yaffs_lstat"},
        {test_yaffs_lstat_ENOENT,test_yaffs_lstat_ENOENT_clean,"test_yaffs_lstat_ENOENT"},

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c b/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
index 5f5437bf924d3e0c4f70273d9b2d2b90e32e47ca..851297fd3fc9a4f7d120465829c2a41854b3cea9 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
@@ -53,7 +53,7 @@ int test_yaffs_rename_EROFS_clean(void)
                }
        }
        
                }
        }
        

-       return  EROFS_clean();
+       return  (EROFS_clean() && yaffs_close(test_yaffs_open()));

 
 }
 
 
 }
 

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c b/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
index c53848cb64424020a4a5d3fd25c48fbab7790c58..74a0b622f7f4a75a22724568657849f903fca83a 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
@@ -18,13 +18,7 @@ static int output = 0;
 int test_yaffs_symlink_EROFS(void)
 {
        int error_code = 0;
 int test_yaffs_symlink_EROFS(void)
 {
        int error_code = 0;

-       if (-1==yaffs_access(SYMLINK_PATH,0)){
-               output=yaffs_symlink(FILE_PATH,SYMLINK_PATH);
-               if (output>0){
-                       print_message("failed to create the first symlink\n",2);
-                       return -1;
-               }
-       }
+

        EROFS_setup();
        output = yaffs_symlink(FILE_PATH,SYMLINK_PATH);
        if (output<0){ 
        EROFS_setup();
        output = yaffs_symlink(FILE_PATH,SYMLINK_PATH);
        if (output<0){ 


@@ -44,7 +38,7 @@ int test_yaffs_symlink_EROFS(void)
 
 int test_yaffs_symlink_EROFS_clean(void)
 {
 
 int test_yaffs_symlink_EROFS_clean(void)
 {

-       return EROFS_clean() && yaffs_unlink(SYMLINK_PATH);
+       return (EROFS_clean() && yaffs_unlink(SYMLINK_PATH));

 }
 
 
 }
 
 

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c b/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
index 23ac0f77a9c68196c67cfb3feebefc3dade39e55..f59dce0550b32ce5f14f02a98866c46658a29adf 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
@@ -12,11 +12,11 @@
  */
 
 #include "test_yaffs_open_EROFS.h"
  */
 
 #include "test_yaffs_open_EROFS.h"

-
+static int output =0;

 
 int test_yaffs_unlink_EROFS(void)
 {
 
 int test_yaffs_unlink_EROFS(void)
 {

-       int output=0;
+

        int error_code=0;
 
        EROFS_setup();
        int error_code=0;
 
        EROFS_setup();


@@ -38,7 +38,7 @@ int test_yaffs_unlink_EROFS(void)
 
 }
 int test_yaffs_unlink_EROFS_clean(void)
 
 }
 int test_yaffs_unlink_EROFS_clean(void)

-{
-       return EROFS_clean();
+{      
+       return EROFS_clean()&& yaffs_close(test_yaffs_open()) ;

 }
 
 }
 

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c b/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
index d39e42a71f1f9fc2155825a43a96be7991f7bb3c..f0071eaede6d022da8b9fa1dbc267a9604a1b10a 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
@@ -19,8 +19,8 @@ int test_yaffs_write_EROFS(void)
 {
        int output=0;
        int error_code=0;
 {
        int output=0;
        int error_code=0;

+       handle=test_yaffs_open();

        EROFS_setup();
        EROFS_setup();

-       handle=yaffs_open(FILE_PATH, O_CREAT  ,S_IREAD);

        if (handle>=0){
                output= yaffs_write(handle, FILE_TEXT, FILE_TEXT_NBYTES);
                if (output<0){
        if (handle>=0){
                output= yaffs_write(handle, FILE_TEXT, FILE_TEXT_NBYTES);
                if (output<0){