X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fdtest.c;h=36152cbb88e56fe669baca5de82d0c7173589401;hb=7211ad39b355b558a4f8a97bc4821ee859888bd6;hp=792c67ef35c539d7b5cd5a6021e723d9ba688101;hpb=92ee023b9d7144e178a050eff898aaae4415096b;p=yaffs2.git

diff --git a/direct/dtest.c b/direct/dtest.c
index 792c67e..36152cb 100644
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -22,6 +22,7 @@
 
 #include "yaffsfs.h"
 
+
 void dumpDir(const char *dname);
 
 char xx[600];
@@ -941,9 +942,11 @@ void rename_over_test(const char *mountpt)
 	int i;
 	char a[100];
 	char b[100];
+	char c[100];
 	
 	sprintf(a,"%s/a",mountpt);
 	sprintf(b,"%s/b",mountpt);
+	sprintf(c,"%s/c",mountpt);
 	
 	yaffs_StartUp();
 	
@@ -953,9 +956,13 @@ void rename_over_test(const char *mountpt)
 	dumpDirFollow(mountpt);
 	
 	
-	i = yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR, 0); 
+	
+	i = yaffs_open(c,O_CREAT | O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+	printf("File c handle is %d\n",i);
 	yaffs_close(i);
-	i = yaffs_open(b,O_CREAT | O_TRUNC | O_RDWR, 0);
+	i = yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR,  S_IREAD | S_IWRITE); 
+	yaffs_close(i);
+	i = yaffs_open(b,O_CREAT | O_TRUNC | O_RDWR,  S_IREAD | S_IWRITE);
 	yaffs_close(i);
 	yaffs_rename(a,b); // rename over
 	yaffs_rename(b,a); // rename back again (not renaimng over)
@@ -2273,11 +2280,29 @@ void random_small_file_test(const char *mountpt,int iterations)
 		
 	yaffs_unmount(mountpt);
 }
+
+void rmdir_test(const char *mountpt)
+{
+	char name[100];
+	yaffs_StartUp();
+	
+	yaffs_mount(mountpt);
+	
+	strcpy(name,mountpt);
+	strcat(name,"/");
+	strcat(name,"hello");
+	yaffs_mkdir(name,0666);
+	yaffs_rmdir(name);
+	yaffs_unmount(mountpt);
+}
 	
 
+int random_seed;
+int simulate_power_failure;
 
 int main(int argc, char *argv[])
 {
+	random_seed = time(NULL);
 	//return long_test(argc,argv);
 	
 	//return cache_read_test();
@@ -2290,7 +2315,9 @@ int main(int argc, char *argv[])
 	 //yaffs_backward_scan_test("/flash/flash");
 	// yaffs_device_flush_test("/flash/flash");
 
-	rename_over_test("/flash/yaffs1");
+	//rename_over_test("//////////////////flash///////////////////yaffs1///////////");
+	
+	rmdir_test("/M18-1");
 	
 	 //scan_pattern_test("/flash",10000,10);
 	//short_scan_test("/flash/flash",40000,200);