Tue Apr 1 12:51:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 57 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6622b683de2..e1d00a2d862 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Apr  1 12:51:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/PluggableUDP/tests/Performance/run_test.pl:
+        * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl:
+        * examples/PluggableUDP/tests/SimplePerformance/run_test.pl:
+        * examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl:
+        * tests/DIOP/run_test.pl:
+          Improved these scripts
+
 Tue Apr  1 12:40:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/DSI_AMI_Gateway/run_exception_test.pl:
diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
index 8efb9e624a0..344296fdfa5 100755
--- a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
+++ b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
@@ -23,7 +23,12 @@ else {
 }
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://:12346");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
index 98baba2d478..e1066e6e2a6 100755
--- a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
+++ b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
@@ -23,7 +23,12 @@ else {
 }
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://[::1]:12346");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
index 409b87c8380..dbf8873c127 100755
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
@@ -9,12 +9,24 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorfile");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
index 6c69f62cd7d..96cbc767fdb 100755
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
@@ -9,12 +9,24 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorfile");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/tests/DIOP/run_test.pl b/TAO/tests/DIOP/run_test.pl
index bfd22c0f235..2efa6f781e5 100755
--- a/TAO/tests/DIOP/run_test.pl
+++ b/TAO/tests/DIOP/run_test.pl
@@ -30,7 +30,12 @@ else {
 
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";