diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-03-09 19:13:58 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-03-09 19:13:58 +0000 |
| commit | c81a1d7de3468ab9e7afb5b509529d5875552a9e (patch) | |
| tree | a4f8d3316b08c94882eab2a802eca010afe26b2d | |
| parent | 3ba2cc14fedaa7b787b4a9f0511e37a717b0cf01 (diff) | |
| download | ATCD-c81a1d7de3468ab9e7afb5b509529d5875552a9e.tar.gz | |
Sat Mar 9 19:08:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rwxr-xr-x | TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2f0c82d824b..0698d7a58cb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 9 19:08:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl: + + Fix the delay for the new test_4 client. It necessarily runs longer + than the standard client timeout. + Sat Mar 9 16:31:33 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp: 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 a749bf7689f..1d7efc06f2a 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 @@ -287,8 +287,6 @@ sub test_4 $server->DeleteFile($lfname); $SV = $server->CreateProcess ("server", " -ORBDebugLevel 5 -ORBSvcConf $svc_conf -ORBLogFile $server_logfile -s 3 -o $server_iorfile"); - $SC = $client->CreateProcess ("client", "-k file://$client_iorfile -s"); - $server_status = $SV->Spawn (); if ($server_status != 0) { @@ -304,9 +302,10 @@ sub test_4 } $CLS = $client->CreateProcess ("client", "-k file://$client_iorfile -n $num_clients"); - $status = $CLS->SpawnWaitKill ($client->ProcessStopWaitInterval()); + $status = $CLS->SpawnWaitKill ($client->ProcessStopWaitInterval() * $num_clients); - $client_status = $SC->SpawnWaitKill ($client->ProcessStopWaitInterval() * $num_clients); + $SC = $client->CreateProcess ("client", "-k file://$client_iorfile -s"); + $client_status = $SC->SpawnWaitKill ($client->ProcessStopWaitInterval()); # Now find the spawned threads in the log file. |