diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-07-10 10:39:30 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-07-10 10:39:30 +0000 |
| commit | 9999afb715521f09b4cbb5464d9f45814592fdca (patch) | |
| tree | b1d5d2d14ef7acbc1495dc9e01020e334b0160e6 | |
| parent | b4d3e8e2a56d2455f589c52d865f09b430eeae37 (diff) | |
| download | ATCD-9999afb715521f09b4cbb5464d9f45814592fdca.tar.gz | |
ChangeLogTag: Fri Jul 10 10:38:00 UTC 2009 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 26 | ||||
| -rw-r--r-- | TAO/bin/tao_orb_tests.lst | 2 | ||||
| -rwxr-xr-x | TAO/tests/Bug_3333_Regression/run_test.pl | 4 |
3 files changed, 21 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 941f5a1b684..b09738223e5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,15 +1,25 @@ +Fri Jul 10 10:38:00 UTC 2009 Simon Massey <sma@prismtech.com> + + * bin/tao_orb_tests.lst: + + Add !CORBA_E_COMPACT & !CORBA_E_MICRO to bugzilla 3333. + + * tests/Bug_3333_Regression/run_test.pl: + + Increase timeout value for test. + Thu Jul 09 13:10:00 UTC 2009 Simon Massey <sma@prismtech.com> * bin/tao_orb_tests.lst: * tao/Invocation_Adapter.cpp: - * tests/Bug_3333_Regression/Bug3333.mpc - * tests/Bug_3333_Regression/README - * tests/Bug_3333_Regression/Test.idl - * tests/Bug_3333_Regression/Hello.h - * tests/Bug_3333_Regression/Hello.cpp - * tests/Bug_3333_Regression/client.cpp - * tests/Bug_3333_Regression/server.cpp - * tests/Bug_3333_Regression/run_test.pl + * tests/Bug_3333_Regression/Bug3333.mpc: + * tests/Bug_3333_Regression/README: + * tests/Bug_3333_Regression/Test.idl: + * tests/Bug_3333_Regression/Hello.h: + * tests/Bug_3333_Regression/Hello.cpp: + * tests/Bug_3333_Regression/client.cpp: + * tests/Bug_3333_Regression/server.cpp: + * tests/Bug_3333_Regression/run_test.pl: Fixed bugzilla 3333. diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index 5999c022334..f79281fa08c 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -132,7 +132,7 @@ TAO/tests/Bug_3276_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI TAO/tests/Bug_3299_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_3315_Regression/run_test.pl: !ST TAO/tests/Bug_3321_Regression/run_test.pl: !ST -TAO/tests/Bug_3333_Regression/run_test.pl: !MINIMUM +TAO/tests/Bug_3333_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_3430_Regression/run_test.pl: TAO/tests/Bug_3470_Regression/run_test.pl: TAO/tests/Bug_3471_Regression/run_test.pl: diff --git a/TAO/tests/Bug_3333_Regression/run_test.pl b/TAO/tests/Bug_3333_Regression/run_test.pl index a6f8de5ca49..ec8328c7748 100755 --- a/TAO/tests/Bug_3333_Regression/run_test.pl +++ b/TAO/tests/Bug_3333_Regression/run_test.pl @@ -45,11 +45,11 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -$client_status = $CL->SpawnWaitKill (30); +$client_status = $CL->SpawnWaitKill (60); if ($client_status != 0) { print STDERR "ERROR: client returned $client_status\n"; $SHUTDOWN = $client->CreateProcess ("Bug3333_Client", " -k file://$server_iorfile -s"); - $SHUTDOWN->SpawnWaitKill (30); + $SHUTDOWN->SpawnWaitKill ($client->ProcessStartWaitInterval() + $client->ProcessStopWaitInterval() + 5); $status = 1; } |