1 files changed, 5 insertions, 15 deletions
diff --git a/TAO/tests/AMH_Oneway/run_test.pl b/TAO/tests/AMH_Oneway/run_test.pl
index e092024d923..aacfe3d9128 100755
--- a/TAO/tests/AMH_Oneway/run_test.pl
+++ b/TAO/tests/AMH_Oneway/run_test.pl
@@ -11,7 +11,7 @@ use lib "../../../bin";
 use PerlACE::Run_Test;
 
 # Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = $PerlACE::wait_interval_for_process_creation;
+$sleeptime = 6;
 
 # File used to pass AMH server ior to its clients.
 # This file name is hard-coded in the server.cpp and client.cpp files
@@ -19,21 +19,11 @@ $iorfile = PerlACE::LocalFile("test.ior");
 
 unlink $iorfile;
 
-if (PerlACE::is_vxworks_test()) {
-  $AMH = new PerlACE::ProcessVX ("server", "");
-}
-else {
-  $AMH = new PerlACE::Process ("server", "");
-}
+$AMH = new PerlACE::Process ("server", "");
 $CL = new PerlACE::Process ("client", "");
 
 # Run the AMH server.
-$sv = $AMH->Spawn ();
-
-if ($sv != 0) {
-   print STDERR "ERROR: AMH server returned $sv\n";
-   exit 1;
-}
+$AMH->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
@@ -42,7 +32,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     exit 1;
 }
 
-# Run the client.
+# Run the cleint client.
 $client = $CL->Spawn ();
 
 
@@ -50,7 +40,7 @@ $client = $CL->Spawn ();
 
 $client = $CL->WaitKill (30);
 if ($client != 0) {
-    print STDERR "ERROR: Client returned $client\n";
+    print STDERR "ERROR: Client returned $amhserver\n";
     $status = 1;
 }