X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_rename_dir_to_file.c;h=5fabdd227cc5c3582ce11bc35cb343cf6a0aabb7;hp=02a068dacb084e12f66819d372db2f54c43f98f4;hb=b470a08d9e257a3c5292637c23aa49103447d6af;hpb=dfb1bb995ecc12562408adf870ccf2006a244f44;ds=sidebyside

diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
index 02a068d..5fabdd2 100644
--- a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
@@ -17,7 +17,7 @@
 int test_yaffs_rename_dir_to_file(void)
 {
 	int output=0;
-
+	int error_code=0;
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output= yaffs_mkdir(DIR_PATH,(S_IREAD | S_IWRITE));
 		if (output<0) {
@@ -25,20 +25,23 @@ int test_yaffs_rename_dir_to_file(void)
 			return -1;
 		}
 	}
-	if (0 !=  yaffs_access(RENAME_PATH,0)) {
-		output= yaffs_mkdir(RENAME_PATH,(S_IREAD | S_IWRITE));
-		if (output<0) {
-			print_message("failed to remove file\n",2);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_rename( DIR_PATH , FILE_PATH);
+	if (output==-1){
+		error_code=yaffs_get_error();
+		if (abs(error_code)==ENOTDIR){
+			return 1;
+		} else {
+			print_message("different error than expected\n",2);
 			return -1;
 		}
-	}
-	output = yaffs_rename( DIR_PATH , RENAME_PATH);
-	if (output<0){ 
-		print_message("failed to rename a file over an empty directory\n",2);
+	} else {
+		print_message("renamed a directory over file.(which is a bad thing)\n",2);
 		return -1;
-	} else{
-		return 1;
-	}	
+	}
 
 }