ChangeLogTag: Tue Jun 25 16:29:44 2002 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 29 insertions, 22 deletions

diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 9bb314e91d3..d3c896c28e3 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -42,35 +42,42 @@ $SV = new PerlACE::Process ("server", $server_args);
 $CL = new PerlACE::Process ("client");
 
 $SV->Spawn();
-$server = $SV->TimedWait(10);
-if ($server == 2) {
-  print STDOUT "Could not change priority levels.  Check user permissions.  Exiting...\n";
-  # Mark as no longer running to avoid errors on exit.
-  $SV->{RUNNING} = 0;
-} else {
-  if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill ();
-    exit 1;
-  }
-  
-  $client = $CL->SpawnWaitKill (60);
-  
-  if ($client != 0) {
+if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) 
+{
+    $server = $SV->TimedWait (1);
+    if ($server == 2) 
+    {
+        print STDOUT "Could not change priority levels.  Check user permissions.  Exiting...\n";
+        # Mark as no longer running to avoid errors on exit.
+        $SV->{RUNNING} = 0;
+        exit $status;
+    }
+    else 
+    {
+        print STDERR "ERROR: cannot find file <$iorfile2>\n";
+        $SV->Kill ();
+        exit 1;
+    }
+}
+ 
+$client = $CL->SpawnWaitKill (60);
+
+if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
-  }
+}
+
+$server = $SV->WaitKill (30);
 
-  $server = $SV->WaitKill (30);
-  
-  if ($server != 0) {
+if ($server != 0) 
+{
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
-  }
-  unlink $iorfile1;
-  unlink $iorfile2;
 }
 
+unlink $iorfile1;
+unlink $iorfile2;
+
 # Clean up SHMIOP files
 PerlACE::check_n_cleanup_files ("server_shmiop_*");