X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fdtest.c;h=4953830694c40290b699c8ef0244cb1cc9739bb6;hp=edf9d63e4b0b82f229a11dbaaedf82deeed0f766;hb=ce0a5fb9849b6dc0d1347709b28d3a34eefec662;hpb=fc4028b21ae665f45c149e66b10d13374721383c

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index edf9d63..4953830 100644
--- a/direct/basic-test/dtest.c
+++ b/direct/basic-test/dtest.c
@@ -2756,6 +2756,59 @@ void link_follow_test(const char *mountpt)
 
 }
 
+void max_files_test(const char *mountpt)
+{
+	char fn[100];
+	char sn[100];
+	char hn[100];
+	int result;
+	int h;
+	int i;
+
+	yaffs_trace_mask = 0;
+
+	yaffs_start_up();
+
+	yaffs_mount(mountpt);
+
+	for(i = 0; i < 5000; i++) {
+		sprintf(fn,"%s/file%d", mountpt, i);
+		yaffs_unlink(fn);
+		h = yaffs_open(fn,O_CREAT| O_RDWR, S_IREAD | S_IWRITE);
+		if(h < 0)
+			printf("File %s not created\n", fn);
+		yaffs_write(h,fn,100);
+		result = yaffs_close(h);
+	}
+	for(i = 0; i < 5; i++){
+		sprintf(fn,"%s/file%d",mountpt, i);
+		yaffs_unlink(fn);
+	}
+
+	for(i = 1000; i < 1010; i++){
+		sprintf(fn,"%s/file%d",mountpt, i);
+		h = yaffs_open(fn,O_CREAT| O_RDWR, S_IREAD | S_IWRITE);
+		yaffs_write(h,fn,100);
+		if(h < 0)
+			printf("File %s not created\n", fn);
+		result = yaffs_close(h);
+	}
+
+	h =yaffs_open(hn,O_RDWR,0);
+
+}
+
+void start_twice(const char *mountpt)
+{
+         printf("About to do first yaffs_start\n");
+         yaffs_start_up();
+         printf("started\n");
+         printf("First mount returns %d\n", yaffs_mount(mountpt));
+         printf("About to do second yaffs_start\n");
+         yaffs_start_up();
+         printf("started\n");
+         printf("Second mount returns %d\n", yaffs_mount(mountpt));
+}
 
 #define N_WRITES 2000
 #define STRIDE	 2000
@@ -2826,7 +2879,7 @@ void verify_big_sparse_file(int h)
 			check_type = "buffer";
 			set_buffer(i/STRIDE);
 		}
-		printf("%s checking %lld\n", check_type, offset);
+		//printf("%s checking %lld\n", check_type, offset);
 		pos = yaffs_lseek(h, offset, SEEK_SET);
 		if(pos != offset) {
 			printf("mismatched seek pos %lld offset %lld\n",
@@ -2884,6 +2937,9 @@ void large_file_test(const char *mountpt)
         dumpDir(mountpt);
 
 	sprintf(fullname, "%s/%s", mountpt, "big-test-file");
+
+	handle = yaffs_open(fullname, O_RDONLY, 0);
+
 	handle = yaffs_open(fullname, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
 
 	if(handle < 0) {
@@ -2894,9 +2950,25 @@ void large_file_test(const char *mountpt)
 	write_big_sparse_file(handle);
 	verify_big_sparse_file(handle);
 
+	yaffs_close(handle);
+
 	printf("Job done\n");
 	yaffs_unmount(mountpt);
 
+	yaffs_mount(mountpt);
+	printf("mounted again\n");
+        dumpDir(mountpt);
+	handle = yaffs_open(fullname, O_RDONLY, 0);
+	verify_big_sparse_file(handle);
+	yaffs_unmount(mountpt);
+
+
+	yaffs_mount_common(mountpt, 0, 1);
+	printf("mounted with no checkpt\n");
+        dumpDir(mountpt);
+	handle = yaffs_open(fullname, O_RDONLY, 0);
+	verify_big_sparse_file(handle);
+	yaffs_unmount(mountpt);
 
 }
 
@@ -2937,7 +3009,7 @@ int main(int argc, char *argv[])
 	 //checkpoint_upgrade_test("/flash/flash",20);
 	  //small_overwrite_test("/flash/flash",1000);
 	  //checkpoint_fill_test("/flash/flash",20);
-	// random_small_file_test("/flash/flash",10000);
+	//random_small_file_test("/flash/flash",10000);
 	 // huge_array_test("/flash/flash",10);
 
 
@@ -2966,8 +3038,13 @@ int main(int argc, char *argv[])
 
 	 //test_flash_traffic("yaffs2");
 	 // link_follow_test("/yaffs2");
+	 //basic_utime_test("/yaffs2");
+
+	 //max_files_test("/yaffs2");
+	 
+	 start_twice("/yaffs2");
 
-	 large_file_test("/yaffs2");
+	 //large_file_test("/yaffs2");
 
 	 //basic_utime_test("/yaffs2");