Thu Oct 25 14:47:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 23 insertions, 8 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7418df32a14..33f5ae33de0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 25 14:47:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2659_Regression_Test.cpp:
+          Do a wait on the reactor thread for 5 seconds, it should
+          end within that time, if not, we return -1. On VxWorks this
+          test doesn't succeed and hangs, with this change it just
+          returns -1 speeding up the test run
+
 Thu Oct 25 13:07:11 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * bin/tao_orb_tests.lst:
diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp
index 41a41e0b57e..10be56ada27 100644
--- a/ACE/tests/Bug_2659_Regression_Test.cpp
+++ b/ACE/tests/Bug_2659_Regression_Test.cpp
@@ -40,8 +40,9 @@ EntryExit ee (CNAME,MNAME,LOC)
 class EntryExit
 {
 public:
-  EntryExit (const ACE_TCHAR* class_name, const ACE_TCHAR *method_name
-       , void *location = 0)
+  EntryExit (const ACE_TCHAR* class_name,
+             const ACE_TCHAR *method_name,
+             void *location = 0)
   {
     class_name_ [20] = method_name_[20] = 0;
 
@@ -156,14 +157,20 @@ run_main (int, ACE_TCHAR *[])
 
   if (thread_manager->kill_all (SIGUSR1) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task signalling failed.\n"))
-            , -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) Task signalling failed.\n")),
+                        -1);
     }
 
-  if (reactor_task.wait () == -1) {
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task wait failed.\n"))
-          , -1);
-  }
+  // Wait 5 seconds for the other thread to exit, if it didn't exit the
+  // wait return -1 and we return with an error
+  ACE_Time_Value timeout (5);
+  if (thread_manager->wait (&timeout, false, false) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) Error, task wait failed.\n")),
+                        -1);
+      }
 
   ACE_END_TEST;