X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fbasic-test%2Fdtest.c;h=9f2d2e6f82d2f810f2c5c13b22851286e2190bf8;hb=c83e416cba6748e7a436c5df6a202349ff4d0fe2;hp=8af524f4891a0350d5b59e41e6844ac4711aaa92;hpb=9ee5d0643e559568dbe62215f76e0a7bd5a63d93;p=yaffs2.git

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index 8af524f..9f2d2e6 100644
--- a/direct/basic-test/dtest.c
+++ b/direct/basic-test/dtest.c
@@ -2791,7 +2791,9 @@ void max_files_test(const char *mountpt)
 		result = yaffs_close(h);
 	}
 
-	h =yaffs_open(hn,O_RDWR,0);
+	yaffs_unmount(mountpt);
+
+	//h =yaffs_open(hn,O_RDWR,0);
 
 }
 void case_insensitive_test(const char *mountpt)
@@ -3046,37 +3048,65 @@ void readdir_test(const char *mountpt)
 	int i;
 	int handle;
 	char fullname[100];
-	
+
 	yaffs_DIR *dirs[100];
-	
+
 
 	yaffs_trace_mask = 0;
 
 	yaffs_start_up();
 
 	yaffs_mount(mountpt);
-	
+
 	for(i = 0; i < 100; i++) {
 	         dirs[i] = yaffs_opendir(mountpt);
 	         printf("%2d %p,", i, dirs[i]);
 	}
-	
+
 	printf("\n");
-	
+
 	for(i = 0; i < 100; i++) {
 	         if(dirs[i])
 	                  yaffs_closedir(dirs[i]);
 	}
-	
-	
+
+
 	for(i = 0; i < 100; i++) {
 	         dirs[i] = yaffs_opendir(mountpt);
 	         printf("%2d %p,", i, dirs[i]);
 	}
-	
+
+	yaffs_unmount(mountpt);
+
 
 }
 
+void format_test(const char *mountpt)
+{
+	int ret;
+
+	yaffs_start_up();
+
+	ret = yaffs_format(mountpt, 0, 0, 0);
+	printf("yaffs_format(...,0, 0, 0) of unmounted returned %d\n", ret);
+
+	yaffs_mount(mountpt);
+
+	ret = yaffs_format(mountpt, 0, 0, 0);
+	printf("yaffs_format(...,0, 0, 0) of mounted returned %d\n", ret);
+
+	ret = yaffs_format(mountpt, 1, 0, 0);
+	printf("yaffs_format(...,1, 0, 0) of mounted returned %d\n", ret);
+
+	ret = yaffs_mount(mountpt);
+	printf("mount should return 0 returned %d\n", ret);
+
+	ret = yaffs_format(mountpt, 1, 0, 1);
+	printf("yaffs_format(...,1, 0, 1) of mounted returned %d\n", ret);
+
+	ret = yaffs_mount(mountpt);
+	printf("mount should return -1 returned %d\n", ret);
+}
 
 int random_seed;
 int simulate_power_failure;
@@ -3145,12 +3175,15 @@ int main(int argc, char *argv[])
 	 // link_follow_test("/yaffs2");
 	 //basic_utime_test("/yaffs2");
 
-	 //max_files_test("/yaffs2");
+
+	format_test("/yaffs2");
+
+	//max_files_test("/yaffs2");
 
 	 //start_twice("/yaffs2");
 
 	 //large_file_test("/yaffs2");
-	 readdir_test("/yaffs2");
+	 //readdir_test("/yaffs2");
 
 	 //basic_utime_test("/yaffs2");
 	 //case_insensitive_test("/yaffs2");