From: charles <charles>
Date: Mon, 12 Jan 2009 00:49:01 +0000 (+0000)
Subject: More test clean ups
X-Git-Tag: pre-name-change~246
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=d8675be9fabcfb48c92ba0e818762d69299c7b7c

More test clean ups
---

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 37fee75..d1199f2 100644
--- a/direct/tests/Makefile
+++ b/direct/tests/Makefile
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.1 2009-01-04 21:44:24 charles Exp $
+# $Id: Makefile,v 1.2 2009-01-12 00:49:01 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -78,4 +78,4 @@ yaffs_test: $(SYMLINKS) $(YAFFSTESTOBJS)
 
 
 clean:
-	rm -f $(ALLOBJS) core
+	rm -f yaffs_test $(ALLOBJS) core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
diff --git a/direct/tests/run_fw_update_test.sh b/direct/tests/run_fw_update_test.sh
index 7b7105c..5bfd945 100755
--- a/direct/tests/run_fw_update_test.sh
+++ b/direct/tests/run_fw_update_test.sh
@@ -7,9 +7,9 @@ do
    seed=$RANDOM   
    j=$(( $i % 10 ))
    rm seed*$j
-   echo $seed>seed$i
+   echo $seed>seed-for-run-$i
    rm data*$j
-   cp ynorsimdata data$i
+   cp emfile-nor data-for-run-$i
    echo "######### Run $i with seed $seed"
    ./yaffs_test -f -u -p -s$seed M18-1
 done
diff --git a/direct/yaffs_fileem.c b/direct/yaffs_fileem.c
index c2ae5e1..6f93972 100644
--- a/direct/yaffs_fileem.c
+++ b/direct/yaffs_fileem.c
@@ -16,7 +16,7 @@
  * This is only intended as test code to test persistence etc.
  */
 
-const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.4 2008-07-21 01:03:19 charles Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.5 2009-01-12 00:49:01 charles Exp $";
 
 
 #include "yportenv.h"
@@ -83,7 +83,7 @@ static int  CheckInit(yaffs_Device *dev)
 	
 	filedisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
 	
-	filedisk.handle = open("emfile512-0", O_RDWR | O_CREAT, S_IREAD | S_IWRITE);
+	filedisk.handle = open("emfile-512-0", O_RDWR | O_CREAT, S_IREAD | S_IWRITE);
 	
 	if(filedisk.handle < 0)
 	{
diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index db90496..915700a 100644
--- a/direct/yaffs_fileem2k.c
+++ b/direct/yaffs_fileem2k.c
@@ -16,7 +16,7 @@
  * This is only intended as test code to test persistence etc.
  */
 
-const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.15 2008-07-21 01:03:19 charles Exp $";
+const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.16 2009-01-12 00:49:01 charles Exp $";
 
 
 #include "yportenv.h"
@@ -71,7 +71,7 @@ static __u8 localBuffer[PAGE_SIZE];
 
 static char *NToName(char *buf,int n)
 {
-	sprintf(buf,"emfile2k-%d",n);
+	sprintf(buf,"emfile-2k-%d",n);
 	return buf;
 }
 
diff --git a/direct/ynorsim.c b/direct/ynorsim.c
index dcab663..0c691a6 100644
--- a/direct/ynorsim.c
+++ b/direct/ynorsim.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#define YNORSIM_FNAME "ynorsimdata"
+#define YNORSIM_FNAME "emfile-nor"
 
 /* Set YNORSIM_BIT_CHANGES to a a value from 1..30 to 
  *simulate bit flipping as the programming happens.