summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-09 02:52:42 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-09 02:52:42 +0000
commit7b8b91669811620f0cc311e65decce778ddaf70c (patch)
treed6e7644d8ac11a01e960c24c4eb46b097d150da9
parent6baa86276e464afdd1d6e56c5bcb17464a7d46b5 (diff)
downloadATCD-7b8b91669811620f0cc311e65decce778ddaf70c.tar.gz
ChangeLogTag:Thu Jul 8 21:50:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c5
-rwxr-xr-xTAO/tests/CDR/run_test.pl10
2 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 7375e6b10bd..438c214238f 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,8 @@
+Thu Jul 8 21:50:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tests/CDR/run_test.pl:
+ The code to check for errors was broken.
+
Thu Jul 08 21:47:00 1999 Chris Gill <cdgill@cs.wustl.edu>
* orbsvcs/orbsvcs/Sched/DynSched.cpp
diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl
index 95600c86b4e..36c84d15ca3 100755
--- a/TAO/tests/CDR/run_test.pl
+++ b/TAO/tests/CDR/run_test.pl
@@ -25,10 +25,12 @@ sub run_test
$TST = Process::Create ($EXEPREFIX."$test".$EXE_EXT,
"$args");
print STDERR "\t$test RUNNING\n";
- $retval = ($TST->Wait ()) / 256;
- if ($retval != 0)
- {
- print STDERR "$brace $test $args FAILED; exited with value $retval\n";
+ $retval = $TST->TimedWait (60);
+ 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 ENDED successfully\n";
}