diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-09 19:53:57 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-09 19:53:57 +0000 |
| commit | 056119219f353d1fd512cf028529840def24356a (patch) | |
| tree | 3def86ee1a4a1a6ad7f78d307166c57d4f1a5425 | |
| parent | fc7f5b6310c9b214617e9bd8b464b19c162ed04f (diff) | |
| download | ATCD-056119219f353d1fd512cf028529840def24356a.tar.gz | |
Thu May 9 19:52:26 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5e0c110dc36..9f85b0d0c2f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu May 9 19:52:26 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Improvements to test performance on windows, aix. + Wed May 8 14:56:24 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tao/Dynamic_TP/DTP_Thread_Pool.cpp: diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl index 99925e985c1..086d8a350d2 100755 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl @@ -326,6 +326,7 @@ sub init_test register_server_with_activator(0, 1); if ($hide_server == 1) { + sleep (2); $name = $SRV[0]->Executable(); rename ($name, "hidden") or die "Rename ($name, \"hidden\") failed: $!"; } @@ -338,7 +339,7 @@ sub fini_test if ($hide_server == 1) { $name = $SRV[0]->Executable(); - rename ("hidden", "server") or die "Rename ($name, \"hidden\") failed: $!"; + rename ("hidden", $name) or die "Rename ($name, \"hidden\") failed: $!"; } if ($srv[1]->WaitForFileTimed ($srvstatusfile[1], $srv[1]->ProcessStartWaitInterval() + $server_reply_delay) == -1) { @@ -348,8 +349,9 @@ sub fini_test } ##### Shutdown servers ##### - for (my $i = 0; $i < $servers_count; $i++ ) { - # Shutting down any server object within the server will shutdown the whole server + for (my $i = $servers_count - 1; $i >= 0; $i-- ) { + # Shutting down any server object within the server will + # shutdown the whole server run_imr_util ("shutdown $obj[$i]"); if ($SRV[$i]->WaitKill ($srv[$i]->ProcessStopWaitInterval ()) == -1) { print STDERR "ERROR: Server $i not terminated correctly\n"; @@ -421,15 +423,14 @@ sub run_list_test run_imr_util ("start $obj[1]"); run_imr_util ("start $obj[0]"); run_imr_util ("list -a"); + run_imr_util ("shutdown $obj[1]"); if ($restart_loc == 1) { restart_imr_locator (); run_imr_util ("list -a"); } - print "sleeping (20).... "; - sleep (20); - print "done\n"; + run_imr_util ("start $obj[1]"); run_imr_util ("list -a"); |