1 files changed, 5 insertions, 78 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 2f004e80d8a..06a5ee135b1 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -198,17 +198,14 @@ sleep $sleeptime;
 
 print STDERR "Starting Distributer\n";
 
-$distributer = $DI->SpawnWaitKill (1000);
+$DI->Spawn ();
 
-if ($distributer != 0) {
-    print STDERR "ERROR: sender returned $distributer\n";
-    $status = 1;
-}
+$SV1->WaitKill(1000);
 
-$sender = $SV1->TerminateWaitKill (1000);
+$distributer = $DI->TerminateWaitKill(1000);
 
-if ($sender != 0) {
-    print STDERR "ERROR: sender returned $sender\n";
+if ($distributer != 0) {
+    print STDERR "ERROR: sender returned $distributer\n";
     $status = 1;
 }
 
@@ -236,76 +233,6 @@ if ($nserver != 0) {
 unlink $nsior;
 unlink $testfile;
 
-print STDERR "\nReceiver 1 --> Distributer --> Sender --> Receiver 2\n\n";
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Receiver 1\n";
-
-$RE1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Distributer\n";
-
-$DI->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Sender\n";
-
-$SV1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Receiver 2\n";
-
-$receiver2 = $RE2->SpawnWaitKill (1000);
-
-if ($receiver2 != 0) {
-    print STDERR "ERROR: receiver2 returned $receiver2\n";
-    $status = 1;
-}
-
-$distributer = $DI->TerminateWaitKill (1000);
-
-if ($distributer != 0) {
-    print STDERR "ERROR: distributer returned $distributer\n";
-    $status = 1;
-}
-
-$receiver1 = $RE1->TerminateWaitKill (1000);
-
-if ($receiver1 != 0) {
-    print STDERR "ERROR: receiver returned $receiver\n";
-    $status = 1;
-}
-
-$sender = $SV1->TerminateWaitKill (1000);
-
-if ($sender != 0) {
-    print STDERR "ERROR: sender returned $sender\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (1000);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior;
-unlink $testfile;
-
 exit $status;