# HG changeset patch
# User nickg
# Date 1181568225 0
# Node ID 64c9e46ea486cbace6276bd94af1d0e1515688d9
# Parent  354b32473c3e7435a23005801b4cad44bea41730
	* tests/klock.c (entry0, entry1): Modify mbox part of test to
	reflect use of plain mbox implementation. The precise ordering of
	events is slightly different.

diff --git a/packages/kernel/current/ChangeLog b/packages/kernel/current/ChangeLog
--- a/packages/kernel/current/ChangeLog
+++ b/packages/kernel/current/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-11  Nick Garnett  <nickg@ecoscentric.com>
+
+	* tests/klock.c (entry0, entry1): Modify mbox part of test to
+	reflect use of plain mbox implementation. The precise ordering of
+	events is slightly different.
+
 2007-01-07  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/sync/mbox.cxx (Cyg_Mbox::get): Fix compiler warning with gcc
diff --git a/packages/kernel/current/tests/klock.c b/packages/kernel/current/tests/klock.c
--- a/packages/kernel/current/tests/klock.c
+++ b/packages/kernel/current/tests/klock.c
@@ -153,6 +153,8 @@ static void entry0( cyg_addrword_t data 
       mbret = cyg_mbox_get( mbh );
       CYG_TEST_CHECK( mbret == (void *)0xAAAAAAAA , "bad result from cyg_mbox_timed_get()");
       thread0_state = 10;
+
+      while( thread1_state < 10 ) cyg_thread_yield();
       
       cyg_mbox_put( mbh, (void *)0xBBBBBBBB );
       thread0_state = 11;
@@ -246,13 +248,16 @@ static void entry1( cyg_addrword_t data 
 #endif
       thread1_state = 10;
 
+      while( thread0_state < 10 ) cyg_thread_yield();
+      
 #ifdef CYGFUN_KERNEL_THREADS_TIMER
       mbret = cyg_mbox_timed_get( mbh, cyg_current_time()+10);
 #else
       mbret = cyg_mbox_get( mbh );
 #endif
+      thread1_state = 11;
       CYG_TEST_CHECK( mbret == (void *)0xBBBBBBBB , "bad result from cyg_mbox[_timed]_get()");
-      thread1_state = 9;
+      thread1_state = 12;
     }
 #endif    
     // --------------------------------------------------