More test fiddling

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

diff --git a/direct/tests/yaffs_fsx.c b/direct/tests/yaffs_fsx.c
index 25d9605354c469dede67b1f6d26ee7f51a1251d7..54f5360ce0446677de3728f123f776240ed23759 100644 (file)
--- a/direct/tests/yaffs_fsx.c
+++ b/direct/tests/yaffs_fsx.c
@@ -46,6 +46,8 @@
  *
  */
 
  *
  */
 

+#include "yaffs_fsx.h"
+

 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef _UWIN
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef _UWIN


@@ -133,7 +135,6 @@ int writebdy = 1;                   /* -w flag */
 long   monitorstart = -1;              /* -m flag */
 long   monitorend = -1;                /* -m flag */
 int    lite = 0;                       /* -L flag */
 long   monitorstart = -1;              /* -m flag */
 long   monitorend = -1;                /* -m flag */
 int    lite = 0;                       /* -L flag */

-long   numops = /*-1 */ 10000000;                      /* -N flag */

 int    randomoplen = 1;                /* -O flag disables it */
 int    seed = 1;                       /* -S flag */
 
 int    randomoplen = 1;                /* -O flag disables it */
 int    seed = 1;                       /* -S flag */
 


@@ -150,7 +151,7 @@ int closeopen = 0;
 void EXIT(int x)
 {
        printf("fsx wanted to exit with %d\n",x);
 void EXIT(int x)
 {
        printf("fsx wanted to exit with %d\n",x);

-       while(1){}
+       while(x){}

 }
 
 char goodfile[1024];
 }
 
 char goodfile[1024];


@@ -798,8 +799,7 @@ int mounted_by_fsx = 0;
 int
 yaffs_fsx_init(const char *mount_pt)
 {
 int
 yaffs_fsx_init(const char *mount_pt)
 {

-       int     i, style, ch;
-       char    *endp;
+       int     i;

 
        goodfile[0] = 0;
        logfile[0] = 0;
 
        goodfile[0] = 0;
        logfile[0] = 0;


@@ -905,10 +905,12 @@ int yaffs_fsx_complete(void)
 }
 
 int
 }
 
 int

-yaffs_fsx_main(const char *mount_pt)
+yaffs_fsx_main(const char *mount_pt, int numops)

 {
        yaffs_fsx_init(mount_pt);
        while (numops == -1 || numops--)
                yaffs_fsx_do_op();
        yaffs_fsx_complete();
 {
        yaffs_fsx_init(mount_pt);
        while (numops == -1 || numops--)
                yaffs_fsx_do_op();
        yaffs_fsx_complete();

+       
+       return 0;

 }
 }