X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fdtest.c;h=3cd13abe5593d7c9d6df12b9125e27c7f6342725;hp=8af524f4891a0350d5b59e41e6844ac4711aaa92;hb=d634851c1f36e7995726602d3af784478ccb472e;hpb=9ee5d0643e559568dbe62215f76e0a7bd5a63d93

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index 8af524f..3cd13ab 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)
@@ -3040,43 +3042,135 @@ void large_file_test(const char *mountpt)
 }
 
 
+int  mk_dir(const char *mp, const char *name)
+{
+	char full_name[100];
+
+	sprintf(full_name, "%s/%s", mp, name);
+
+	return yaffs_mkdir(full_name, S_IREAD| S_IWRITE);
+}
+
+int  mk_file(const char *mp, const char *name)
+{
+	char full_name[100];
+	int h;
+
+	sprintf(full_name, "%s/%s", mp, name);
+
+	h = yaffs_open(full_name, O_RDWR | O_CREAT | O_TRUNC, S_IREAD| S_IWRITE);
+
+	yaffs_write(h, name, strlen(name));
+
+	yaffs_close(h);
+	return 0;
+}
+
+void xx_test(const char *mountpt)
+{
+	char xx_buffer[1000];
+
+	yaffs_start_up();
+
+	yaffs_format(mountpt,0,0,0);
+
+	yaffs_mount(mountpt);
+	printf("mounted\n");
+	dumpDir(mountpt);
+
+	printf("create files\n");
+
+	mk_dir(mountpt, "foo");
+	mk_file(mountpt, "foo/f1");
+	mk_file(mountpt, "foo/f2");
+	mk_file(mountpt, "foo/f3");
+	mk_file(mountpt, "foo/f4");
+	dump_directory_tree(mountpt);
+
+	printf("unmount and remount\n");
+
+	/* Unmount/remount */
+	yaffs_unmount(mountpt);
+	yaffs_mount(mountpt);
+	dump_directory_tree(mountpt);
+}
+
+void yy_test(const char *mountpt)
+{
+	char xx_buffer[1000];
+
+	yaffs_start_up();
+
+	yaffs_mount(mountpt);
+	dump_directory_tree(mountpt);
+}
+
+
 void readdir_test(const char *mountpt)
 {
 	char xx_buffer[1000];
 	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,16 +3239,22 @@ 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");
 
+	 yy_test("/yaffs2");
+
+
 	 return 0;
 
 }