Sun Mar 4 19:31:16 2001 Darrell Brunsch <brunsch@uci.edu>

3 files changed, 39 insertions, 33 deletions

diff --git a/performance-tests/RPC/run_test.pl b/performance-tests/RPC/run_test.pl
index 4280d2cabd0..305509dc83a 100755
--- a/performance-tests/RPC/run_test.pl
+++ b/performance-tests/RPC/run_test.pl
@@ -7,26 +7,28 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../bin';
 use PerlACE::Run_Test;
-use Cwd;
 
-my $SV = new PerlACE::Process ("server");
+$SV = new PerlACE::Process ("server");
+$CL = new PerlACE::Process ("client", "-i 10000 -h localhost");
+
+$status = 0;
 
 $SV->Spawn ();
 
 sleep 5;
 
-$CL = new PerlACE::Process ("client", " -i 10000 -h localhost");
-
-$CL->Spawn (60);
+$client = $CL->SpawnWaitKill (60);
 
-$client = $CL->WaitKill (60);
 $server = $SV->WaitKill (5);
 
-unlink $iorfile;
+if ($server != 0) {
+    print "ERROR: server returned $server\n";
+    $status = 1;
+}
 
-if ($server != 0 || $client != 0) {
-  print "ERROR: non-zero status returned by the server or client\n";
-  exit 1;
+if ($client != 0) {
+    print "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-exit 0;
+exit $status;
diff --git a/performance-tests/TCP/run_test.pl b/performance-tests/TCP/run_test.pl
index d5049d14f59..34c4f416c39 100755
--- a/performance-tests/TCP/run_test.pl
+++ b/performance-tests/TCP/run_test.pl
@@ -7,26 +7,28 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../bin';
 use PerlACE::Run_Test;
-use Cwd;
 
-my $SV = new PerlACE::Process ("tcp_test", "-s");
+$SV = new PerlACE::Process ("tcp_test", "-s");
+$CL = new PerlACE::Process ("tcp_test", "-c localhost -i 50000 -b 64");
+
+$status = 0;
 
 $SV->Spawn ();
 
 sleep 5;
 
-$CL = new PerlACE::Process ("tcp_test", " -c localhost -i 50000 -b 64");
-
-$CL->Spawn (60);
+$client = $CL->SpawnWaitKill (60);
 
-$client = $CL->WaitKill (60);
 $server = $SV->WaitKill (5);
 
-unlink $iorfile;
+if ($server != 0) {
+    print "ERROR: server returned $server\n";
+    $status = 1;
+}
 
-if ($server != 0 || $client != 0) {
-  print "ERROR: non-zero status returned by the server or client\n";
-  exit 1;
+if ($client != 0) {
+    print "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-exit 0;
+exit $status;
diff --git a/performance-tests/UDP/run_test.pl b/performance-tests/UDP/run_test.pl
index 4515cd8c3d8..638b8c18c99 100755
--- a/performance-tests/UDP/run_test.pl
+++ b/performance-tests/UDP/run_test.pl
@@ -7,26 +7,28 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../bin';
 use PerlACE::Run_Test;
-use Cwd;
 
-my $SV = new PerlACE::Process ("udp_test", "-r");
+$SV = new PerlACE::Process ("udp_test", "-r");
+$CL = new PerlACE::Process ("udp_test", "-t -n 10000 localhost");
+
+$status = 0;
 
 $SV->Spawn ();
 
 sleep 5;
 
-$CL = new PerlACE::Process ("udp_test", " -t -n 10000 localhost");
-
-$CL->Spawn (60);
+$client = $CL->SpawnWaitKill (60);
 
-$client = $CL->WaitKill (60);
 $server = $SV->WaitKill (5);
 
-unlink $iorfile;
+if ($server != 0) {
+    print "ERROR: server returned $server\n";
+    $status = 1;
+}
 
-if ($server != 0 || $client != 0) {
-  print "ERROR: non-zero status returned by the server or client\n";
-  exit 1;
+if ($client != 0) {
+    print "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-exit 0;
+exit $status;