ChangeLogTag:Sat Jun 19 22:27:35 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

2 files changed, 33 insertions, 8 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ccd52e0d9b2..7b4dca8ed4d 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,8 @@
+Sat Jun 19 22:27:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tests/Multiple_Inheritance/run_test.pl:
+	  Made this test safe for nightly builds.
+
 Sat Jun 19 22:22:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* tao/ORB_Core.h:
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index 62efff0ff29..c8e6ca8b4aa 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -9,14 +9,34 @@ unshift @INC, '../../../bin';
 require ACEutils;
 
 $iorfile = "server.ior";
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $iorfile");
-
-ACE::waitforfile ($iorfile);
-
-$status  = system ($EXEPREFIX."client$EXE_EXT -f $iorfile");
-
-$SV->Kill (); $SV->Wait ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+		       " -f $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
+
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT",
+		       " -f $iorfile");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$SV->Terminate (); $server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;