Change a few tests

[yaffs2.git] / direct / fsx_test / yaffs_fsx.c

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 */