diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-29 09:40:04 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-29 09:40:04 +0000 |
commit | 5a71d5f3f5542e887aa0c97ed8fe0b2d62fcabce (patch) | |
tree | 582c6a040ac8a649c4286462d33c031f2bbc9e1e | |
parent | 92161825eb11f1b37a7921fb2c2f7e2d5a676e8c (diff) | |
download | ATCD-5a71d5f3f5542e887aa0c97ed8fe0b2d62fcabce.tar.gz |
Tue May 29 09:39:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/ChangeLog | 8 | ||||
-rwxr-xr-x | TAO/tests/MT_BiDir/run_test.pl | 5 | ||||
-rwxr-xr-x | TAO/tests/Oneway_Timeouts/run_test.pl | 7 | ||||
-rwxr-xr-x | TAO/tests/RTCORBA/Server_Protocol/run_test.pl | 11 | ||||
-rwxr-xr-x | TAO/tests/Servant_To_Reference_Test/run_test.pl | 6 |
5 files changed, 28 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8c8b54263d9..56cfc9910b1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue May 29 09:39:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/MT_BiDir/run_test.pl: + * tests/Oneway_Timeouts/run_test.pl: + * tests/RTCORBA/Server_Protocol/run_test.pl: + * tests/Servant_To_Reference_Test/run_test.pl: + Updated for vxworks testing + Tue May 29 09:25:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/RTCORBA/Banded_Connections/run_test.pl: diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl index 2b2fde9c381..02ea1a066e9 100755 --- a/TAO/tests/MT_BiDir/run_test.pl +++ b/TAO/tests/MT_BiDir/run_test.pl @@ -9,12 +9,13 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); +$iorfilebase = "test.ior"; +$iorfile = PerlACE::LocalFile ("$iorfilebase"); unlink $iorfile; if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -o test.ior -c 3 -i 100"); + $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -o $iorfilebase -c 3 -i 100"); } else { $SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100"); diff --git a/TAO/tests/Oneway_Timeouts/run_test.pl b/TAO/tests/Oneway_Timeouts/run_test.pl index b664ceed956..fef9b42f509 100755 --- a/TAO/tests/Oneway_Timeouts/run_test.pl +++ b/TAO/tests/Oneway_Timeouts/run_test.pl @@ -21,7 +21,12 @@ use strict; my $srv_ior = PerlACE::LocalFile ("server.ior"); my $CLI = new PerlACE::Process ("client"); -my $SRV = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + my $SRV = new PerlACE::Process ("server"); +} +else { + my $SRV = new PerlACE::ProcessVX ("server"); +} my $SRV_PORT = PerlACE::random_port(); my $SRV_ARGS = "-orbendpoint iiop://:$SRV_PORT"; diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl index d7679672dab..3ebdb34632b 100755 --- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl @@ -7,8 +7,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; - -$iorfile = PerlACE::LocalFile ("test.ior"); +$iorfilebase = "test.ior"; +$iorfile = PerlACE::LocalFile ("$iorfilebase"); unlink $iorfile; $status = 0; @@ -75,7 +75,12 @@ foreach $o (@server_opts) { print STDERR "\n\n----------------------------------\n"; print STDERR " ".$comments[$test_number]; - my $args = "$o -o $iorfile"; + if (PerlACE::is_vxworks_test()) { + my $args = "$o -o $iorfilebase"; + } + else { + my $args = "$o -o $iorfile"; + } unlink $iorfile; diff --git a/TAO/tests/Servant_To_Reference_Test/run_test.pl b/TAO/tests/Servant_To_Reference_Test/run_test.pl index bb271d0789a..8418895af5c 100755 --- a/TAO/tests/Servant_To_Reference_Test/run_test.pl +++ b/TAO/tests/Servant_To_Reference_Test/run_test.pl @@ -7,13 +7,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; - -$iorfile = PerlACE::LocalFile ("server.ior"); +$iorfilebase = "server.ior"; +$iorfile = PerlACE::LocalFile ("$iorfilebase"); unlink $iorfile; $status = 0; if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); + $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase"); } else { $SV = new PerlACE::Process ("server", "-o $iorfile"); |