1 files changed, 29 insertions, 16 deletions
diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl
index eeaf6f75224..0e5ff81a79c 100755
--- a/TAO/tests/CDR/run_test.pl
+++ b/TAO/tests/CDR/run_test.pl
@@ -6,31 +6,44 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+use Cwd;
 
 $brace="\#\#\#\#\#";
 %tests = ("basic_types" => "-n 256 -l 10",
-          "tc" => "",
-          "growth" => "-l 64 -h 256 -s 4 -n 10 -q",
-          "alignment" => "",
-          "allocator" => "-q");
+	  "tc" => "",
+	  "growth" => "-l 64 -h 256 -s 4 -n 10 -q",
+	  "alignment" => "",
+	  "allocator" => "-q");
 $test = "";
 $args = "";
-$status = 0;
+$| = 1;
 print STDERR "\n";
 
-while (($test,$args) = each %tests) {
+ACE::checkForTarget(getcwd());
+
+sub run_test
+{
+    #my $test = shift (@tests);
+    #my $args = shift (@argslist);
+
     print STDERR "\n$brace $test $args test BEGUN\n";
-    $TST = new PerlACE::Process ($test, $args);
-    print STDERR "\tRUNNING $test\n";
-    
-    $retval = $TST->SpawnWaitKill (90);
-
-    if ($retval != 0) { 
-        print STDERR "ERROR $brace $test $args, exit value $retval\n";
-        $status = 1;
+    $TST = Process::Create  ($EXEPREFIX."$test".$EXE_EXT,
+                             "$args");
+    print STDERR "\t$test RUNNING\n";
+    $retval = $TST->TimedWait (90);
+    if ($retval == -1) {
+      print STDERR "ERROR $brace $test $args TIMEOUT\n";
+      $TST->Kill (); $TST->TimedWait (5);
+    } elsif ($retval != 0) { 
+      print STDERR "ERROR $brace $test $args, exit value $retval\n";
     }
     print STDERR "$brace $test FINISHED successfully\n";
 }
 
-exit $status;
+while (($test,$args) = each %tests)
+{
+    run_test ($test, $args);
+}
+
+exit 0;