Change a few tests

diff --git a/direct/dtest.c b/direct/dtest.c
index fc71d768915a164592d6be903dcd9749a6a70303..8476743d8cdec14916445d8777ee397a6190d2b8 100644 (file)
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -2296,7 +2296,7 @@ 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///////////");
        
         //scan_pattern_test("/flash",10000,10);
        //short_scan_test("/flash/flash",40000,200);

diff --git a/direct/fsx_test/yaffs_fsx.c b/direct/fsx_test/yaffs_fsx.c
index 8e7f38b24270f31b52a3c051382533cf46634216..64588c8bc7aa1f6e83a65c7e5bd6fe643504688b 100644 (file)
--- a/direct/fsx_test/yaffs_fsx.c
+++ b/direct/fsx_test/yaffs_fsx.c
@@ -130,7 +130,11 @@ int        writebdy = 1;                   /* -w flag */
 long   monitorstart = -1;              /* -m flag */
 long   monitorend = -1;                /* -m flag */
 int    lite = 0;                       /* -L flag */
+<<<<<<< yaffs_fsx.c
+long   numops = 5000;                  /* -N flag */
+=======
 long   numops = /*-1 */ 100000;                        /* -N flag */
+>>>>>>> 1.3
 int    randomoplen = 1;                /* -O flag disables it */
 int    seed = 1;                       /* -S flag */
 

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index d67719b16bbd1a2ecac03c36077fdc79f19161fb..0a91e3f5c3e5e6b89a8d25414490bfa5b76ff55f 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -121,7 +121,7 @@ static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
        { "/ram2k", &ram2kDev},
        {(void *)0,(void *)0}
 #else
-       { "/", &ramDev},
+       //{ "/", &ramDev},
        { "/flash/yaffs1", &bootDev},
        { "/flash/yaffs2", &flashDev},
        { "/ram2k", &ram2kDev},