summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog16
-rwxr-xr-xTAO/tests/Bug_2174_Regression/run_test.pl6
-rwxr-xr-xTAO/tests/Bug_2319_Regression/run_test.pl9
-rwxr-xr-xTAO/tests/Bug_2792_Regression/run_test.pl6
-rwxr-xr-xTAO/tests/Bug_2795_Regression/run_test.pl6
-rwxr-xr-xTAO/tests/Bug_2809_Regression/run_test.pl9
-rwxr-xr-xTAO/tests/Bug_2935_Regression/run_test.pl11
-rwxr-xr-xTAO/tests/IORManipulation/run_test.pl9
-rwxr-xr-xTAO/tests/ORB_destroy/run_test.pl9
-rwxr-xr-xTAO/tests/ORB_init/run_test.pl9
-rwxr-xr-xTAO/tests/POA/Deactivate_Object/run_test.pl9
-rwxr-xr-xTAO/tests/POA/wait_for_completion/run_test.pl9
12 files changed, 57 insertions, 51 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index afc2870f222..b56ad4ee391 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Sun Nov 11 19:55:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Bug_2174_Regression/run_test.pl
+ * tests/Bug_2319_Regression/run_test.pl
+ * tests/Bug_2792_Regression/run_test.pl
+ * tests/Bug_2795_Regression/run_test.pl
+ * tests/Bug_2809_Regression/run_test.pl
+ * tests/Bug_2935_Regression/run_test.pl
+ * tests/IORManipulation/run_test.pl
+ * tests/ORB_destroy/run_test.pl
+ * tests/ORB_init/run_test.pl
+ * tests/POA/Deactivate_Object/run_test.pl
+ * tests/POA/wait_for_completion/run_test.pl
+ Added support for VxWorks cross platform testing and simplified
+ the files
+
Sun Nov 11 19:15:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IORManipulation/filter/run_test.pl:
diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index 12f41476a9a..2cb0ad75401 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -34,7 +34,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_cr
exit 1;
}
-$client = $CL->SpawnWaitKill (15);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
$SV->Kill ();
unlink $iorfile;
if ($client != 2) {
@@ -59,7 +59,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_cr
exit 1;
}
-$client = $CL->SpawnWaitKill (15);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
$SV->Kill ();
if ($client != 3) {
print STDERR "ERROR: client returned $client in test B, expected 3\n";
@@ -73,7 +73,7 @@ if ($client != 3) {
# This test was failing on win32 without this sleep.
sleep 1;
-$client = $CL->SpawnWaitKill (15);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
unlink $iorfile;
if ($client != 5) {
print STDERR "ERROR: client returned $client in test C, expected 5\n";
diff --git a/TAO/tests/Bug_2319_Regression/run_test.pl b/TAO/tests/Bug_2319_Regression/run_test.pl
index 708d658fe7c..76a29d0638c 100755
--- a/TAO/tests/Bug_2319_Regression/run_test.pl
+++ b/TAO/tests/Bug_2319_Regression/run_test.pl
@@ -10,12 +10,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
-if (PerlACE::is_vxworks_test()) {
- $AMH = new PerlACE::ProcessVX ("server", "");
-}
-else {
- $AMH = new PerlACE::Process ("server", "");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$AMH = new $class ("server");
# Run the AMH server.
$AMH->Spawn ();
diff --git a/TAO/tests/Bug_2792_Regression/run_test.pl b/TAO/tests/Bug_2792_Regression/run_test.pl
index 92b78a0b270..3ac7a1623bc 100755
--- a/TAO/tests/Bug_2792_Regression/run_test.pl
+++ b/TAO/tests/Bug_2792_Regression/run_test.pl
@@ -10,9 +10,11 @@ use PerlACE::Run_Test;
$status = 0;
-$CL = new PerlACE::Process ("client", "");
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$CL = new $class ("client");
-$client = $CL->SpawnWaitKill (150);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
if ($client != 0) {
print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/Bug_2795_Regression/run_test.pl b/TAO/tests/Bug_2795_Regression/run_test.pl
index 92b78a0b270..3ac7a1623bc 100755
--- a/TAO/tests/Bug_2795_Regression/run_test.pl
+++ b/TAO/tests/Bug_2795_Regression/run_test.pl
@@ -10,9 +10,11 @@ use PerlACE::Run_Test;
$status = 0;
-$CL = new PerlACE::Process ("client", "");
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$CL = new $class ("client");
-$client = $CL->SpawnWaitKill (150);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
if ($client != 0) {
print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/Bug_2809_Regression/run_test.pl b/TAO/tests/Bug_2809_Regression/run_test.pl
index 0b71b15dc62..1387cb678e7 100755
--- a/TAO/tests/Bug_2809_Regression/run_test.pl
+++ b/TAO/tests/Bug_2809_Regression/run_test.pl
@@ -17,12 +17,9 @@ foreach $i (@ARGV) {
}
}
-if (PerlACE::is_vxworks_test()) {
-$SV = new PerlACE::ProcessVX ("server", "");
-}
-else {
-$SV = new PerlACE::Process ("server", "");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$T = new $class ("server");
$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
diff --git a/TAO/tests/Bug_2935_Regression/run_test.pl b/TAO/tests/Bug_2935_Regression/run_test.pl
index fe5db086431..d79b21073be 100755
--- a/TAO/tests/Bug_2935_Regression/run_test.pl
+++ b/TAO/tests/Bug_2935_Regression/run_test.pl
@@ -21,9 +21,11 @@ sub count_matching_lines {
}
$status = 0;
-$sinkiorfile = PerlACE::LocalFile ("sink.ior");
+$sinkiorfilebase = "sink.ior";
+$sinkiorfile = PerlACE::LocalFile ("$sinkiorfilebase");
$middleiorfile = PerlACE::LocalFile ("middle.ior");
-$sinklogfile = PerlACE::LocalFile ("sink.log");
+$sinklogfilebase = "sink.log";
+$sinklogfile = PerlACE::LocalFile ("$sinklogfilebase");
$middlelogfile = PerlACE::LocalFile ("middle.log");
$sourcelogfile = PerlACE::LocalFile ("source.log");
@@ -33,7 +35,12 @@ unlink $sinklogfile;
unlink $middlelogfile;
unlink $sourcelogfile;
+if (PerlACE::is_vxworks_test()) {
+$SV = new PerlACE::ProcessVX ("sink", "-o $sinkiorfilebase -orblogfile $sinklogfilebase -orbdebuglevel 9");
+}
+else {
$SV = new PerlACE::Process ("sink", "-o $sinkiorfile -orblogfile $sinklogfile -orbdebuglevel 9");
+}
$MD = new PerlACE::Process ("middle", "-o $middleiorfile -f $sinkiorfile -ORBSvcConf middle.conf -orblogfile $middlelogfile -orbdebuglevel 9");
$CL = new PerlACE::Process ("source", "-f $middleiorfile -orblogfile $sourcelogfile -orbdebuglevel 9");
diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl
index e2df5613d0e..9c5cca01e26 100755
--- a/TAO/tests/IORManipulation/run_test.pl
+++ b/TAO/tests/IORManipulation/run_test.pl
@@ -8,12 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
-if (PerlACE::is_vxworks_test()) {
- $T = new PerlACE::ProcessVX ("IORTest");
-}
-else {
- $T = new PerlACE::Process ("IORTest");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$T = new $class ("IORTest");
$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
diff --git a/TAO/tests/ORB_destroy/run_test.pl b/TAO/tests/ORB_destroy/run_test.pl
index 8434e081af1..651c3fa1ac9 100755
--- a/TAO/tests/ORB_destroy/run_test.pl
+++ b/TAO/tests/ORB_destroy/run_test.pl
@@ -8,12 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
-if (PerlACE::is_vxworks_test()) {
- $T = new PerlACE::ProcessVX ("ORB_destroy");
-}
-else {
- $T = new PerlACE::Process ("ORB_destroy");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$T = new $class ("ORB_destroy");
$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
diff --git a/TAO/tests/ORB_init/run_test.pl b/TAO/tests/ORB_init/run_test.pl
index f9b2781b422..72f31cb0545 100755
--- a/TAO/tests/ORB_init/run_test.pl
+++ b/TAO/tests/ORB_init/run_test.pl
@@ -8,12 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
-if (PerlACE::is_vxworks_test()) {
- $T = new PerlACE::ProcessVX ("ORB_init");
-}
-else {
- $T = new PerlACE::Process ("ORB_init");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$T = new $class ("ORB_init");
$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
diff --git a/TAO/tests/POA/Deactivate_Object/run_test.pl b/TAO/tests/POA/Deactivate_Object/run_test.pl
index 2b56e9924db..5939bda2874 100755
--- a/TAO/tests/POA/Deactivate_Object/run_test.pl
+++ b/TAO/tests/POA/Deactivate_Object/run_test.pl
@@ -10,12 +10,9 @@ use PerlACE::Run_Test;
$status = 0;
-if (PerlACE::is_vxworks_test()) {
- $SV = new PerlACE::ProcessVX ("server");
-}
-else {
- $SV = new PerlACE::Process ("server");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$SV = new $class ("server");
$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
diff --git a/TAO/tests/POA/wait_for_completion/run_test.pl b/TAO/tests/POA/wait_for_completion/run_test.pl
index 8b5cd957c73..f664fb47d21 100755
--- a/TAO/tests/POA/wait_for_completion/run_test.pl
+++ b/TAO/tests/POA/wait_for_completion/run_test.pl
@@ -8,12 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
-if (PerlACE::is_vxworks_test()) {
- $T = new PerlACE::ProcessVX ("wait_for_completion");
-}
-else {
- $T = new PerlACE::Process ("wait_for_completion");
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
+$T = new $class ("wait_for_completion");
$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
View Lorry Controller Status