Wed Mar 8 11:19:37 UTC 2006 Don Sharp <Donald.Sharp@prismtech.com>

8 files changed, 18 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 122713c83b5..80ad4045684 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Mar  8 11:19:37 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * tests/Bug_2377_Regression/*:
+          removed from TAO level to the more appropriate orbsvcs
+
+        * orbsvcs/tests/Bug_2377_Regression/*:
+          Regression for bug 2377 moved here.
+
 Wed Mar  8 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/LocalObject.cpp:
diff --git a/TAO/tests/Bug_2377_Regression/Bug_2377_Regression.mpc b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
index 5bd9f3a372e..6616beb3c5d 100644
--- a/TAO/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
@@ -1,3 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
 project(*Test) : orbsvcsexe, taoidldefaults, portablegroup, portableserver {
   exename = uipmc_test
   Source_Files {
diff --git a/TAO/tests/Bug_2377_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
index 18eae182297..8c9fc67c0ed 100644
--- a/TAO/tests/Bug_2377_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
@@ -8,6 +8,7 @@
 #include "ace/Task.h"
 #include "ace/Mutex.h"
 #include "ace/streams.h"
+#include "ace/OS_NS_time.h"
 #include "tao/debug.h"
 #include "tao/corba.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
@@ -20,6 +21,9 @@
 void
 sleep(int millisec)
 {
+#ifdef ACE_WIN32
+    ::Sleep(millisec);
+#else
     struct timespec tv;
     tv.tv_sec = millisec / 1000;
     tv.tv_nsec = (millisec % 1000) * 1000000;
@@ -30,6 +34,7 @@ sleep(int millisec)
     {
         tv = tv_not_elapsed;
     }
+#endif /* ACE_WIN32 */
 };
 
 class MessageLog
diff --git a/TAO/tests/Bug_2377_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
index f6b6d7eb0b7..f6b6d7eb0b7 100644
--- a/TAO/tests/Bug_2377_Regression/Hello.idl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
diff --git a/TAO/tests/Bug_2377_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
index 97f55140199..322eeff3e7e 100755
--- a/TAO/tests/Bug_2377_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
+use lib '../../../../bin';
 use PerlACE::Run_Test;
 
 $dum_core = PerlACE::LocalFile ("core");
diff --git a/TAO/tests/Bug_2377_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
index 1510ade0e8f..1510ade0e8f 100644
--- a/TAO/tests/Bug_2377_Regression/svc.conf
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index 6d9e7174f88..62e90eeff82 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -51,7 +51,6 @@ TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2328_Regression/run_test.pl:
 TAO/tests/Bug_2345_Regression/run_test.pl:
 TAO/tests/Bug_2349_Regression/run_test.pl:
-TAO/tests/Bug_2377_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index 49dc60585d1..e7e7b6d9ba8 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -79,6 +79,7 @@ TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTOR
 TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !STATIC !SUNCC5_1
+TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM
 TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO
 TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING !ACE_FOR_TAO