diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-05-14 20:08:39 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-05-14 20:08:39 +0000 |
| commit | 676cfdab1d3221144cae8b25b2df65f216fd2c1e (patch) | |
| tree | f17ad8919acd09621d5e0e7e6e02c52c155457ac /TAO/tests/Dynamic_TP | |
| parent | 739e9a413130edc847ef56ad4204848712299375 (diff) | |
| download | ATCD-676cfdab1d3221144cae8b25b2df65f216fd2c1e.tar.gz | |
Wed May 14 20:04:21 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* tao/Dynamic_TP/DTP_Task.h:
* tao/Dynamic_TP/DTP_Task.cpp:
Fix another race condition that can cause the server to hang.
* tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl:
* tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl:
Always run all tests.
Diffstat (limited to 'TAO/tests/Dynamic_TP')
| -rwxr-xr-x | TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl | 15 | ||||
| -rwxr-xr-x | TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl index 5d0fd4a25de..acd7713a075 100755 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl @@ -382,17 +382,10 @@ my $status = 0; # thread_timeout (in seconds) # max_queue_request_depth - while () - { - $status = test_1($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_2($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_3($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_4($server, $client, $iorbase, $deletelogs); - last; - } +$status += test_1($server, $client, $iorbase, $deletelogs); +$status += test_2($server, $client, $iorbase, $deletelogs); +$status += test_3($server, $client, $iorbase, $deletelogs); +$status += test_4($server, $client, $iorbase, $deletelogs); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl index 2d5486135e8..73273e14294 100755 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl @@ -359,17 +359,10 @@ my $status = 0; # thread_timeout (in seconds) # max_queue_request_depth - while () - { - $status = test_1($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_2($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_3($server, $client, $iorbase, $deletelogs); - last if ($status); - $status = test_4($server, $client, $iorbase, $deletelogs); - last; - } +$status += test_1($server, $client, $iorbase, $deletelogs); +$status += test_2($server, $client, $iorbase, $deletelogs); +$status += test_3($server, $client, $iorbase, $deletelogs); +$status += test_4($server, $client, $iorbase, $deletelogs); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); |