yaffs Added more tests to direct/timothy_tests/quick_tests

[yaffs2.git] / direct / timothy_tests / quick_tests / test_yaffs_rename_EEXISTS.c

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c b/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
index b1df21def1791c84dec8cc617c7ac39930fefde4..432be36c72c8bf6ee117e3fc9e75fd5331445a77 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
@@ -44,7 +44,7 @@ int test_yaffs_rename_EEXISTS(void)
        output = yaffs_rename(DIR_PATH , RENAME_DIR_PATH);
        if (output<0){ 
                error_code=yaffs_get_error();
-               if (abs(error_code)==EEXIST){
+               if (abs(error_code)==ENOTEMPTY){
                        return 1;
                } else {
                        print_message("returned error does not match the the expected error\n",2);
@@ -60,6 +60,13 @@ int test_yaffs_rename_EEXISTS(void)
 int test_yaffs_rename_EEXISTS_clean(void)
 {
        int output = 0;
+       if (0 ==  yaffs_access("/yaffs2/dir2/file",0) ) {
+               output = yaffs_unlink("/yaffs2/dir2/file");
+               if (output < 0) {
+                       print_message("failed to remove the file\n",2);
+                       return -1;
+               }
+       }
        if (0 ==  yaffs_access(RENAME_PATH,0) && 0 != yaffs_access(DIR_PATH,0)) {
                output = yaffs_rename(RENAME_PATH,FILE_PATH);
                if (output < 0) {
@@ -67,6 +74,7 @@ int test_yaffs_rename_EEXISTS_clean(void)
                        return -1;
                }
        }
+       
        return 1;
 
 }