Mercurial > yaffs-ecoscentric

changeset 313:ba05a98df7e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
yaffs: fixup tests (#1000826)
author wry
date Mon, 28 Sep 2009 16:51:16 +0000
parents 8678bc743892
children 6bbc585bac00
files packages/fs/yaffs/current/ChangeLog packages/fs/yaffs/current/tests/fops.c
diffstat 2 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/packages/fs/yaffs/current/ChangeLog
+++ b/packages/fs/yaffs/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-28  Ross Younger  <wry@ecoscentric.com>
+
+	* tests/fops.c: Don't make unreasonable use of stack.
+
 2009-09-24  Ross Younger  <wry@ecoscentric.com>
 
 	* doc/yaffs.sgml: Various fixups.
--- a/packages/fs/yaffs/current/tests/fops.c
+++ b/packages/fs/yaffs/current/tests/fops.c
@@ -259,9 +259,10 @@ static void reinit_prng(void)
     ar4prng_init(&prng, seed, SEEDLEN);
 }
 
+unsigned char buf[IOSIZE], testbuf[IOSIZE];
+
 static void createfile( char *name, size_t size )
 {
-    unsigned char buf[IOSIZE];
     int fd;
     ssize_t wrote;
     int err;
@@ -305,7 +306,6 @@ static void createfile( char *name, size
 
 static void checkfile( char *name )
 {
-    unsigned char buf[IOSIZE], testbuf[IOSIZE];
     int fd;
     ssize_t done, pos=0, lastread=-1;
     int i;
@@ -378,9 +378,7 @@ static void checkfile( char *name )
 
 static void copyfile( char *name2, char *name1 )
 {
-
     int err;
-    char buf[IOSIZE];
     int fd1, fd2;
     ssize_t done, wrote;
 
@@ -416,14 +414,11 @@ static void copyfile( char *name2, char 
 
     err = close( fd2 );
     if( err < 0 ) SHOW_RESULT( close, err );
-    
 }
 
 static void comparefiles( char *name2, char *name1 )
 {
     int err;
-    char buf1[IOSIZE];
-    char buf2[IOSIZE];
     int fd1, fd2;
     ssize_t done1, done2;
     int i;
@@ -444,10 +439,10 @@ static void comparefiles( char *name2, c
 
     for(;;)
     {
-        done1 = read( fd1, buf1, IOSIZE );
+        done1 = read( fd1, buf, IOSIZE );
         if( done1 < 0 ) SHOW_RESULT( read, done1 );
 
-        done2 = read( fd2, buf2, IOSIZE );
+        done2 = read( fd2, testbuf, IOSIZE );
         if( done2 < 0 ) SHOW_RESULT( read, done2 );
 
         if( done1 != done2 )
@@ -456,9 +451,9 @@ static void comparefiles( char *name2, c
         if( done1 == 0 ) break;
 
         for( i = 0; i < done1; i++ )
-            if( buf1[i] != buf2[i] )
+            if( buf[i] != testbuf[i] )
             {
-                diag_printf("buf1[%d](%02x) != buf1[%d](%02x)\n",i,buf1[i],i,buf2[i]);
+                diag_printf("buf[%d](%02x) != buf[%d](%02x)\n",i,buf[i],i,testbuf[i]);
                 CYG_TEST_FAIL("Data in files not equal\n");
             }
     }
@@ -477,7 +472,6 @@ static void comparefiles( char *name2, c
 
 static void maxfile( char *name )
 {
-    unsigned char buf[IOSIZE];
     int fd;
     ssize_t wrote;
     int err;
@@ -775,7 +769,7 @@ void cyg_user_start(void)
 #ifndef CYGDBG_USE_ASSERTS
     CYG_TEST_INFO("WARNING: asserts disabled, test INCOMPLETE, try switching on CYGPKG_INFRA_DEBUG");
 #else
-    CYG_TEST_PASS("All OK");
+    CYG_TEST_PASS_FINISH("All OK");
 #endif
 }