yaffs: Tweak test scripts

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

diff --git a/direct/tests/yaffs_test.c b/direct/tests/yaffs_test.c
index 5a1e0c77d1c3243631706329e3fbc8d74ed788ef..520626abe74e07ece3dd438f6240c3fe46c6bfce 100644 (file)
--- a/direct/tests/yaffs_test.c
+++ b/direct/tests/yaffs_test.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *

- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -24,6 +24,8 @@
 
 #include "yaffsfs.h"
 
 
 #include "yaffsfs.h"
 

+#include "yaffs_trace.h"
+

 #include "nor_stress.h"
 #include "yaffs_fsx.h"
 
 #include "nor_stress.h"
 #include "yaffs_fsx.h"
 


@@ -71,7 +73,8 @@ void yaffs_bash_around(const char *mountpt, int n_cycles)
                
        while(n_cycles){
                if(cycle % 100 == 0){
                
        while(n_cycles){
                if(cycle % 100 == 0){

-                       printf("CYCLE %8d mo %2d space %d ",cycle,op_max,yaffs_freespace(mountpt));
+                       printf("CYCLE %8d mo %2d inodes %d space %d ",cycle,op_max,
+                               yaffs_inodecount(mountpt),yaffs_freespace(mountpt));

                        for(i = 0; i < BASH_HANDLES; i++)
                                printf("%2d ",h[i]);
                        printf("\n");
                        for(i = 0; i < BASH_HANDLES; i++)
                                printf("%2d ",h[i]);
                        printf("\n");


@@ -189,7 +192,7 @@ int main(int argc, char **argv)
        signal(SIGBUS,bad_ptr_handler);
        signal(SIGABRT,bad_ptr_handler);
 #endif 
        signal(SIGBUS,bad_ptr_handler);
        signal(SIGABRT,bad_ptr_handler);
 #endif 

-       while ((ch = getopt(argc,argv, "bfilmn:ps:u"))
+       while ((ch = getopt(argc,argv, "bfilmn:ps:t:u"))

               != EOF)
                switch (ch) {
                case 's':
               != EOF)
                switch (ch) {
                case 's':


@@ -219,6 +222,9 @@ int main(int argc, char **argv)
                case 'n':
                        n_cycles = atoi(optarg);
                        break;
                case 'n':
                        n_cycles = atoi(optarg);
                        break;

+               case 't':
+                       yaffs_traceMask = strtol(optarg,NULL,0);
+                       break;

                default:
                        BadUsage();
                        /* NOTREACHED */
                default:
                        BadUsage();
                        /* NOTREACHED */