diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-03 02:07:05 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-03 02:07:05 +0000 |
| commit | d7ce14b2438a6d09726d1fb04f174598c5cbac85 (patch) | |
| tree | 81470ee99b9f47efd5eecb983c60be3b0a45b043 | |
| parent | 802155d126b424fbb1636f9e9483ea024d2d5f6f (diff) | |
| download | ATCD-d7ce14b2438a6d09726d1fb04f174598c5cbac85.tar.gz | |
Sun Feb 02 21:01:12 2003 Frank Hunleth <frank@hunleth.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Miop/McastHello/run_test.pl | 12 |
2 files changed, 19 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6747cbeff55..371e7fd5d4b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Sun Feb 02 21:01:12 2003 Frank Hunleth <frank@hunleth.com> + + * orbsvcs/tests/Miop/McastHello/run_test.pl: Fixed a race condition + in the test script that could sometime cause the client to send + its requests before the second server starts. This occurs under + WinXP when using the Microsoft Loopback Adapter. Thanks to + Wolfgang Schroeder <cpp_kurs@arcor.de> for the configuration. + Sun Feb 2 13:05:12 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Collocation/Makefile.impl: diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl index ecf565614ea..8ead1e2580a 100755 --- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl +++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl @@ -9,14 +9,16 @@ use lib '../../../../../bin'; use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); +$iorfile_server2 = PerlACE::LocalFile ("server.ior.unused"); unlink $iorfile; +unlink $iorfile_server2; $status = 0; $server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); $SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); -$SV2 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); +$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 -ORBsvcconf $server_conf"); $CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBsvcconf $client_conf"); $SV1->Spawn (); @@ -29,6 +31,13 @@ if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } +if (PerlACE::waitforfile_timed ($iorfile_server2, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile_server2>\n"; + $SV1->Kill (); $SV1->TimedWait (1); + $SV2->Kill (); $SV2->TimedWait (1); + exit 1; +} + $client = $CL->SpawnWaitKill (300); if ($client != 0) { @@ -51,5 +60,6 @@ if ($server != 0) { } unlink $iorfile; +unlink $iorfile_server2; exit $status; |