1 files changed, 49 insertions, 23 deletions
diff --git a/TAO/tests/AMI_Timeouts/run_test.pl b/TAO/tests/AMI_Timeouts/run_test.pl
index e6596d067a3..05f46bc9ea3 100755
--- a/TAO/tests/AMI_Timeouts/run_test.pl
+++ b/TAO/tests/AMI_Timeouts/run_test.pl
@@ -5,38 +5,64 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("server.ior");
+$cwd = getcwd();
+$client_conf="$DIR_SEPARATOR" . "muxed.conf";
+$client_process="simple_client";
+$debug_level='0';
+$threads='2';
+$iterations='1';
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
+foreach $i (@ARGV) {
+  if ($i eq '-mux') {
+    $client_conf = "muxed.conf";
+  } elsif ($i eq '-debug') {
+    $debug_level = '1';
+  } elsif ($i eq '-exclusive') {
+    $client_conf = 'exclusive.conf';
+  }
+}
 
-$SV = new PerlACE::Process ("server", "-d -o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
+$iorfile = "server.ior";
 
-$SV->Spawn ();
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+			  " -ORBdebuglevel $debug_level"
+			  . "-d -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 20) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
-$server = $SV->TerminateWaitKill (5);
-
-unlink $iorfile;
+$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT",
+			  " -ORBsvcconf $client_conf "
+			  . "-ORBdebuglevel $debug_level"
+			  . " -k file://$iorfile "
+			  . " -i $iterations -x -d");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-exit $status;
+unlink $iorfile;
+
+if ($server != 0 || $client != 0) {
+   exit 1;
+}
+ 
+exit 0;
+