diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-29 10:07:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-29 10:07:53 +0000 |
| commit | 671d89deb0d464875447c5f90f864011c3fbb97f (patch) | |
| tree | d27ed6e4c335cbdfe38e002c77a337fac552bb29 | |
| parent | 9445e2ac9bf9d541cf56a336adc17bc05620b7aa (diff) | |
| download | ATCD-671d89deb0d464875447c5f90f864011c3fbb97f.tar.gz | |
Wed Aug 29 10:07:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rwxr-xr-x | TAO/tests/POA/Forwarding/run_test.pl | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 541d043609e..46696993b32 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 29 10:07:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/POA/Forwarding/run_test.pl: + Updated for VxWorks cross platform testing + Wed Aug 29 08:16:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/OBV/Simple/client.cpp: diff --git a/TAO/tests/POA/Forwarding/run_test.pl b/TAO/tests/POA/Forwarding/run_test.pl index f0063a4d849..1456f66fa3f 100755 --- a/TAO/tests/POA/Forwarding/run_test.pl +++ b/TAO/tests/POA/Forwarding/run_test.pl @@ -13,13 +13,19 @@ print STDERR "\n"; $status = 0; -$iorfile1 = PerlACE::LocalFile ("server1.ior"); +$iorfile1base = "server.ior"; +$iorfile1 = PerlACE::LocalFile ("$iorfile1base"); $iorfile2 = PerlACE::LocalFile ("server2.ior"); $iorfile3 = PerlACE::LocalFile ("server3.ior"); unlink $iorfile1, $iorfile2, $iorfile3; -$SV1 = new PerlACE::Process ("server", "-o $iorfile1"); +if (PerlACE::is_vxworks_test()) { + $SV1 = new PerlACE::ProcessVX ("server", "-o $iorfile1base"); +} +else { + $SV1 = new PerlACE::Process ("server", "-o $iorfile1"); +} $SV2 = new PerlACE::Process ("server", "-o $iorfile2 -f file://$iorfile1"); $SV3 = new PerlACE::Process ("server", "-o $iorfile3 -f file://$iorfile2"); $CL = new PerlACE::Process ("client", "-s 3 -k file://$iorfile3"); @@ -53,9 +59,9 @@ if (PerlACE::waitforfile_timed ($iorfile3, $PerlACE::wait_interval_for_process_c } $client = $CL->SpawnWaitKill (60); -$server1 = $SV1->WaitKill (10); -$server2 = $SV2->WaitKill (10); -$server3 = $SV3->WaitKill (10); +$server1 = $SV1->WaitKill (15); +$server2 = $SV2->WaitKill (15); +$server3 = $SV3->WaitKill (15); unlink $iorfile1, $iorfile2, $iorfile3; |