# HG changeset patch
# User Ross Younger <wry@ecoscentric.com>
# Date 1257271283 0
# Node ID b254764fbeac59f00ff41efa5ebe206b3641f881
# Parent  38a956139d12c8530aeb8ed2fa19877bddf4a852
Patch tests to work on this codebase

diff --git a/packages/fs/yaffs/current/ChangeLog b/packages/fs/yaffs/current/ChangeLog
--- a/packages/fs/yaffs/current/ChangeLog
+++ b/packages/fs/yaffs/current/ChangeLog
@@ -1,7 +1,7 @@
 2009-11-03  Ross Younger  <wry@ecoscentric.com>
 
 	* tests: Import from eCosPro: mounttime, yaffs1, yaffs2,
-	yaffs4, yaffs5, yaffs6.
+	yaffs4, yaffs5, yaffs6. Patch for codebase differences.
 
 2009-11-02  Ross Younger  <wry@ecoscentric.com>
 
diff --git a/packages/fs/yaffs/current/tests/yaffs1.c b/packages/fs/yaffs/current/tests/yaffs1.c
--- a/packages/fs/yaffs/current/tests/yaffs1.c
+++ b/packages/fs/yaffs/current/tests/yaffs1.c
@@ -925,7 +925,8 @@ void fileio1_main( CYG_ADDRESS id )
     }
 
     diag_printf("<INFO>: syncing\n");    
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     
     CYG_TEST_PASS_FINISH("yaffs1");
 }
diff --git a/packages/fs/yaffs/current/tests/yaffs2.c b/packages/fs/yaffs/current/tests/yaffs2.c
--- a/packages/fs/yaffs/current/tests/yaffs2.c
+++ b/packages/fs/yaffs/current/tests/yaffs2.c
@@ -747,7 +747,8 @@ void fileio2_main( CYG_ADDRESS id )
     if( err < 0 ) SHOW_RESULT( unlink, err );
 
     db_printf("<INFO>: syncing\n");
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     
     if( id == 0 )
     {
diff --git a/packages/fs/yaffs/current/tests/yaffs4.c b/packages/fs/yaffs/current/tests/yaffs4.c
--- a/packages/fs/yaffs/current/tests/yaffs4.c
+++ b/packages/fs/yaffs/current/tests/yaffs4.c
@@ -900,7 +900,8 @@ void fileio4_main( CYG_ADDRESS id )
     }
 
     diag_printf("<INFO>: syncing\n");    
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     
     CYG_TEST_PASS_FINISH("yaffs4");
 }
diff --git a/packages/fs/yaffs/current/tests/yaffs5.c b/packages/fs/yaffs/current/tests/yaffs5.c
--- a/packages/fs/yaffs/current/tests/yaffs5.c
+++ b/packages/fs/yaffs/current/tests/yaffs5.c
@@ -596,7 +596,7 @@ void checkcwd( const char *cwd )
 
 void fs_callback( cyg_int32 event, CYG_ADDRWORD data )
 {
-#if 1
+#if 0
     diag_printf("Filesystem %sSAFE\n",
                 event==CYG_FS_CALLBACK_UNSAFE?"UN":"");
 #endif
@@ -690,7 +690,8 @@ void yaffs5_main( CYG_ADDRESS id )
     createfile( "yaffs5.0", 1024*1024, 16*1024 );
     checkfile( "yaffs5.0",16*1024 );    
     err = unlink( "yaffs5.0" );
-    sync();    
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
 #endif
 
 #if 1
@@ -702,7 +703,8 @@ void yaffs5_main( CYG_ADDRESS id )
 #if 1
     createfile( "yaffs5.1", 1024*1024, 1024 );
     createfile( "yaffs5.2", 1024*1024, 4*1024 );
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     createfile( "yaffs5.3", 8*1024*1024, 32*1024 );
 
     checkfile( "yaffs5.1", 1024 );
@@ -762,7 +764,8 @@ void yaffs5_main( CYG_ADDRESS id )
 #if 1
 
     diag_printf("<INFO>: syncing\n");    
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
         
     checkfile1(TEST_MOUNTPOINT TEST_DIRECTORY "/yaffs5.4", 32*1024 );
 
@@ -780,7 +783,8 @@ void yaffs5_main( CYG_ADDRESS id )
 #endif
 
     diag_printf("<INFO>: syncing\n");    
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     
     CYG_TEST_PASS_FINISH("yaffs5");
 }
diff --git a/packages/fs/yaffs/current/tests/yaffs6.c b/packages/fs/yaffs/current/tests/yaffs6.c
--- a/packages/fs/yaffs/current/tests/yaffs6.c
+++ b/packages/fs/yaffs/current/tests/yaffs6.c
@@ -934,7 +934,8 @@ void yaffs6_main( CYG_ADDRESS id )
     }
 
     diag_printf("<INFO>: syncing\n");    
-    sync();
+    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
+    if (err != 0) SHOW_RESULT(sync, err);
     
     CYG_TEST_PASS_FINISH("yaffs6");
 }