ChangeLogTag:Tue Jun 8 00:09:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 32 insertions, 10 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 1e670cbe7c9..bc7175245a8 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Tue Jun  8 00:09:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tests/MT_Client/run_test.pl:
+	  The test driver works more reliably now.
+
+	* tests/NestedUpcall/Reactor/client.h:
+	* tests/NestedUpcall/Reactor/mt_client.h:
+	  Fixed ORB vs. servants order
+
 Mon Jun 07 23:39:40 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tao/Object_Adapter.cpp (Servant_Upcall): The code in the
diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
index bc4123e44ac..c0d92fdb348 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -68,15 +68,15 @@ private:
   int shutdown_;
   // Flag to tell server to shutdown.
 
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
   Reactor_var reactor_;
   // reactor pointer for NestedUpCalls.
 
   CORBA::Environment env_;
   // Environment variable.
 
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   u_int call_count_;
   // # of calls made to functions.
 
diff --git a/TAO/tests/NestedUpcall/Reactor/mt_client.h b/TAO/tests/NestedUpcall/Reactor/mt_client.h
index a42eeed78e3..15f0345917f 100644
--- a/TAO/tests/NestedUpcall/Reactor/mt_client.h
+++ b/TAO/tests/NestedUpcall/Reactor/mt_client.h
@@ -68,11 +68,11 @@ private:
   int nthreads_;
   // # of threads
 
-  Reactor_var reactor_;
-  // reactor pointer for NestedUpCalls.
-
   CORBA::ORB_var orb_;
   // Remember our orb.
+
+  Reactor_var reactor_;
+  // reactor pointer for NestedUpCalls.
 };
 
 #endif /* TAO_NUC_MT_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl
index 5a9ef6a7b97..3e2fdb5b4c3 100755
--- a/TAO/tests/NestedUpcall/Reactor/run_test.pl
+++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl
@@ -10,26 +10,39 @@ require Process;
 require ACEutils;
 
 $file="test.ior";
+$mtfile="mttest.ior";
+
+print "\n\n==== Single-threaded test\n";
 
 $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                        "-o $file");
+sleep 2;
 
 ACE::waitforfile ($file);
 
 $status  = system ($EXEPREFIX."client".$Process::EXE_EXT.
-                   "-x -k file://$file");
+                   " -x -k file://$file");
 
 $SV->Wait ();
 
+unlink ($file);
+
+print "\n\n==== Multi-threaded test\n";
+
+sleep 5;
+
 $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-                       "-o $file");
+                       " -o $mtfile");
+sleep 2;
 
-ACE::waitforfile ($file);
+ACE::waitforfile ($mtfile);
 
 $status  = system ($EXEPREFIX."mt_client".$Process::EXE_EXT.
-                   "-x -k file://$file -ORBsvcconf svc.mt.conf");
+                   " -x -k file://$mtfile -ORBsvcconf svc.mt.conf");
 
 $SV->Wait ();
 
+unlink ($mtfile);
+
 # @@ Capture any errors from the server too.
 exit $status;