summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-20 14:33:12 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-20 14:33:12 +0000
commit09fe1cdc494016607664f08604be37d9afd4469b (patch)
tree0f4673bcc94562090ec89a97728d431f3e5fa4ab /TAO
parentfd6687d76c3d3b84a86cf8cdcce6f3c88287a221 (diff)
downloadATCD-09fe1cdc494016607664f08604be37d9afd4469b.tar.gz
ChangeLogTag: Fri Jun 20 14:32:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog7
-rwxr-xr-xTAO/tests/OctetSeq/run_test.pl14
2 files changed, 17 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 86f8b4ac555..8b9b4488329 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 20 14:32:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
+
+ * tests/OctetSeq/run_test.pl:
+
+ Reverted my change from Mon Jun 9 12:28:24 UTC 2008. The test
+ framework is moving in a different direction.
+
Fri Jun 20 14:15:00 UTC 2008 Simon Massey <sma at prismtech dot com>
* orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h:
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index 6e079e8aebf..78fc54542a1 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -9,13 +9,19 @@ use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
$status = 0;
-$iorfile = "test.ior";
+$iorfile = PerlACE::LocalFile ("test.ior");
unlink $iorfile;
-$SV = new PerlACE::TargetProcess ("server", "-o $iorfile");
-$T = new PerlACE::TargetProcess ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
-$CL = new PerlACE::HostProcess ("client", "-i 5000 -k file://$iorfile");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
+ $T = new PerlACE::ProcessVX ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
+}
+else {
+ $SV = new PerlACE::Process ("server", "-o $iorfile");
+ $T = new PerlACE::Process ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
+}
+$CL = new PerlACE::Process ("client", "-i 5000 -k file://$iorfile");
print STDERR "\n\n==== Octet sequence passing test\n";