More test clean ups

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 37fee756623a0d10e03dd597f88479a6b8c889e9..d1199f274fb4d73036741737f21b19d82f82816a 100644 (file)
--- a/direct/tests/Makefile
+++ b/direct/tests/Makefile
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
 #
 # 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
 
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 


@@ -78,4 +78,4 @@ yaffs_test: $(SYMLINKS) $(YAFFSTESTOBJS)
 
 
 clean:
 
 
 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 7b7105c32c856d643635cbad733bd70e570da7ca..5bfd945122cfd4e8022ae4bba270700821d8f079 100755 (executable)
--- 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
    seed=$RANDOM   
    j=$(( $i % 10 ))
    rm seed*$j

-   echo $seed>seed$i
+   echo $seed>seed-for-run-$i

    rm data*$j
    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
    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 c2ae5e1e5e46346c963e5c7e9f5fe068cf38b39d..6f93972c813aad938550278a44b39555f1916d0a 100644 (file)
--- 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.
  */
 
  * 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"
 
 
 #include "yportenv.h"


@@ -83,7 +83,7 @@ static int  CheckInit(yaffs_Device *dev)
        
        filedisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
        
        
        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)
        {
        
        if(filedisk.handle < 0)
        {

diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index db90496eea148277f617c0e3aba7d0cc270b598a..915700a352f2470eee6d0489dfc425ffac940238 100644 (file)
--- 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.
  */
 
  * 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"
 
 
 #include "yportenv.h"


@@ -71,7 +71,7 @@ static __u8 localBuffer[PAGE_SIZE];
 
 static char *NToName(char *buf,int n)
 {
 
 static char *NToName(char *buf,int n)
 {

-       sprintf(buf,"emfile2k-%d",n);
+       sprintf(buf,"emfile-2k-%d",n);

        return buf;
 }
 
        return buf;
 }
 

diff --git a/direct/ynorsim.c b/direct/ynorsim.c
index dcab663cc89ecd9dffa80c89f5235792d293acc6..0c691a6a58c4418ee377ed4e8d76f16dbce535a0 100644 (file)
--- a/direct/ynorsim.c
+++ b/direct/ynorsim.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <time.h>
 
 #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. 
 
 /* Set YNORSIM_BIT_CHANGES to a a value from 1..30 to 
  *simulate bit flipping as the programming happens.