summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-10 13:14:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-10 13:14:31 +0000
commit10cd962e9c8573fa12e4404ec2ca38ba23c37545 (patch)
tree78e161c09afaf6095ed27789d9fe6d2a1dda2903
parent43248e3fd4527bdbc019b5b28bf4fd47264940cb (diff)
downloadATCD-10cd962e9c8573fa12e4404ec2ca38ba23c37545.tar.gz
Wed Jan 10 13:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog11
-rwxr-xr-xTAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl8
-rwxr-xr-xTAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl8
-rwxr-xr-xTAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl8
-rwxr-xr-xTAO/orbsvcs/tests/AVStreams/Latency/run_test.pl7
5 files changed, 38 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a1f6606f701..251ac7d448a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jan 10 13:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
+ * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
+ * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
+ * orbsvcs/tests/AVStreams/Latency/run_test.pl:
+ Check the result of th spawn of the first executable in
+ the test itself. With this change if we have a naming
+ service but no test executable we don't wait a long time
+ on a non existent process
+
Wed Jan 10 12:30:00 UTC 2007 Simon Massey <sma@prismtech.com>
* examples/mfc/server.cpp:
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 3742c592eea..01c969d6c31 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -47,7 +47,13 @@ if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
print STDERR "Starting Receiver 1\n";
-$RE1->Spawn ();
+$RE1_result = $RE1->Spawn ();
+
+if ($RE1_result != 0) {
+ print STDERR "ERROR: Receiver 1 returned $RE1_result\n";
+ $NS->Kill ();
+ exit 1;
+}
sleep $sleeptime;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index efe05403c37..2b53d1e8f49 100755
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -38,7 +38,13 @@ if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
print STDERR "Starting Receiver\n";
-$SV->Spawn ();
+$RE1_result = $SV->Spawn ();
+
+if ($RE1_result != 0) {
+ print STDERR "ERROR: Receiver returned $RE1_result\n";
+ $NS->Kill ();
+ exit 1;
+}
sleep $sleeptime;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index de19cf0ba3c..25450efcbaa 100755
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -51,7 +51,13 @@ if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
print STDERR "Starting Receiver 1\n";
-$RE1->Spawn ();
+$RE1_result = $RE1->Spawn ();
+
+if ($RE1_result != 0) {
+ print STDERR "ERROR: Receiver 1 returned $RE1_result\n";
+ $NS->Kill ();
+ exit 1;
+}
sleep $sleeptime;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
index 7323a2af76e..e68dc081e27 100755
--- a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
@@ -23,7 +23,12 @@ $CTRL = new PerlACE::Process ("control", "-f file://$pingior -g file://$pongior"
print STDERR "Starting Ping\n";
-$PING->Spawn ();
+$PING_result = $PING->Spawn ();
+
+if ($PING_result != 0) {
+ print STDERR "ERROR: Ping returned $PING_result\n";
+ exit 1;
+}
if (PerlACE::waitforfile_timed ($pingior, 20) == -1) {
print STDERR "ERROR: cannot find file <$pingior>\n";