summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2013-05-01 13:36:35 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2013-05-01 13:36:35 +0000
commit003165c45426c692293ab4696b3636267bd2570c (patch)
tree7bb2801c53bc4568941083c9207dff96bdf67c4c
parent97319ead271f4205f81f97547589298cace859be (diff)
downloadATCD-003165c45426c692293ab4696b3636267bd2570c.tar.gz
Wed May 1 13:32:09 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog11
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README22
3 files changed, 33 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 04df9740d92..e09608c2792 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed May 1 13:32:09 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl:
+
+ The test does not require persistence, removing it allows the test
+ to work as intended on MacOS.
+
+ * orbsvcs/tests/ImplRepo/servers_interact_on_startup/README:
+
+ Document the new test variations.
+
Tue Apr 30 20:31:14 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* bin/tao_other_tests.lst:
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
index 6ffeeba57f7..dd3a3855163 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
@@ -78,8 +78,8 @@ $IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator",
"-UnregisterIfAddressReused ".
"-d $imr_debug_level ".
"$ping_ext ".
- "-o $imr_imriorfile ".
- "-p $imr_imrdbfile");
+ "-o $imr_imriorfile ");
+# "-p $imr_imrdbfile");
$SRV_A = $srva->CreateProcess ("serverA",
"_ORBDebugLevel = $debug_level ".
"-ORBEndpoint " . "$protocol" . "://:" . "$srv_port_base/portspan=20 ".
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README
index 952cb9b99a8..e88d67ac7fa 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README
@@ -54,11 +54,29 @@ Usage
To run this test, run the run_test.pl perl script. It takes two
optional arguments:
--server_reply_delay <seconds> This is the delay in seconds the CORBA
-object in S3 will make before replying to a request.
+-server_reply_delay <seconds>
+This is the delay in seconds the CORBA object in S3 will make before replying
+to a request.
-v <milliseconds>
The verification interval in milliseconds for the ImR to use.
-?
The usage and default value of the options.
+
+-debug
+get debug output from all the processes. The IMR Locator log output is
+captured in ./imr_loc.log
+
+-debuglog
+All the processes write log output to individual log files
+
+-imr_start
+Use this option to run a simple test where the tao_imr start command is
+uesd to launch a server.
+This should not time out.
+
+-hide_server
+Use this along with the -imr_start option to test an error condition of a
+registered server being removed from the filesystem. The tao_imr start
+command should recover without hanging.