diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-23 11:42:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-23 11:42:36 +0000 |
| commit | 7f079ce0e0eff467249d65f749f69f1ebeb565e1 (patch) | |
| tree | eac43d488a10e451f945730a4deff69d0d346cc2 | |
| parent | 9d897e947d555e3b30b3c6104c0194c61840d670 (diff) | |
| download | ATCD-7f079ce0e0eff467249d65f749f69f1ebeb565e1.tar.gz | |
Wed May 23 11:41:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rwxr-xr-x | TAO/tests/POA/EndpointPolicy/run_test.pl | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 10333436f91..db6b1ff0111 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed May 23 11:41:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/POA/EndpointPolicy/run_test.pl: + Updated for cross platform testing + Tue May 22 12:40:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/GIOP_Message_Generator_Parser.cpp (write_reply_header): diff --git a/TAO/tests/POA/EndpointPolicy/run_test.pl b/TAO/tests/POA/EndpointPolicy/run_test.pl index 292ca488d3f..1edfcadfaeb 100755 --- a/TAO/tests/POA/EndpointPolicy/run_test.pl +++ b/TAO/tests/POA/EndpointPolicy/run_test.pl @@ -10,22 +10,24 @@ use PerlACE::Run_Test; $status = 0; -$goodiorfile = PerlACE::LocalFile ("good.ior"); -$badiorfile = PerlACE::LocalFile ("bad.ior"); +$goodiorbase = "good.ior"; +$badiorbase = "bad.ior"; +$goodiorfile = PerlACE::LocalFile ("$goodiorbase"); +$badiorfile = PerlACE::LocalFile ("$badiorbase"); unlink $goodiorfile; unlink $badiorfile; $port = 12345; if (PerlACE::is_vxworks_test()) { - $sharedSV = new PerlACE::ProcessVX ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 1 -g $goodiorfile -b $badiorfile -p $port"); + $sharedSV = new PerlACE::ProcessVX ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 1 -g $goodiorbase -b $badiorbasee -p $port"); } else { $sharedSV = new PerlACE::Process ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 1 -g $goodiorfile -b $badiorfile -p $port"); } if (PerlACE::is_vxworks_test()) { - $multiSV = new PerlACE::ProcessVX ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 0 -g $goodiorfile -b $badiorfile -p $port"); + $multiSV = new PerlACE::ProcessVX ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 0 -g $goodiorbase -b $badiorbase -p $port"); } else { $multiSV = new PerlACE::Process ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 0 -g $goodiorfile -b $badiorfile -p $port"); @@ -94,7 +96,7 @@ if ($client != 0) { $status = 1; } -$server = $multiSV->WaitKill (10); +$server = $multiSV->WaitKill (15); if ($server != 0) { print STDERR "ERROR: server [multiple profiles per IOR] returned $server\n"; |