diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-05-09 13:18:27 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-05-09 13:18:27 +0000 |
| commit | 8a9879b1ae26ba1121bffb34f2aabbc4af618d24 (patch) | |
| tree | cc367d1d982f09aa932eff50837b3baeee184cbd | |
| parent | d0e27e0947271fc81238f3ac68ec541eaf1e8d4d (diff) | |
| download | ATCD-8a9879b1ae26ba1121bffb34f2aabbc4af618d24.tar.gz | |
ChangeLogTag: Thu May 9 08:16:11 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Simple_Naming/run_test.pl | 25 |
2 files changed, 28 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 332108bc8b7..a5043e17dcc 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,10 +1,17 @@ -Thu May 9 03:33:20 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> +Thu May 9 08:16:11 2002 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/tests/Simple_Naming/run_test.pl: + + Reordered the individual tests and added a sleep between + instances of the Naming_Service (for Windows only). + +Thu May 9 03:33:20 2002 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp: * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp: Get rid of call to Connection_Manager::destroy() method. -Wed May 8 22:03:48 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> +Wed May 8 22:03:48 2002 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/tests/AVStreams/Component_Switching/*: Memory management fixes. diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index 9eb626eea2b..f00d5d3d1a4 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -66,33 +66,38 @@ sub client } } +## The options below have been reordered due to a +## initialization problem (within the Naming_Service) +## that has only been seen on Windows XP. + # Options for all simple tests recognized by the 'client' program. @opts = ("-s -ORBInitRef NameService=file://$iorfile", + "-p $persistent_ior_file -ORBInitRef NameService=file://$iorfile", + "-p $file_persistent_ior_file -ORBInitRef NameService=file://$iorfile", "-s -ORBInitRef NameService=mcast://:$ns_multicast_port\::/NameService", "-t -ORBInitRef NameService=file://$iorfile", "-i -ORBInitRef NameService=file://$iorfile", "-e -ORBInitRef NameService=file://$iorfile", "-y -ORBInitRef NameService=file://$iorfile", - "-p $persistent_ior_file -ORBInitRef NameService=file://$iorfile", "-c file://$persistent_ior_file -ORBInitRef NameService=file://$iorfile", - "-p $file_persistent_ior_file -ORBInitRef NameService=file://$iorfile", "-c file://$file_persistent_ior_file -ORBInitRef NameService=file://$iorfile"); -@server_opts = ("", "", "", "", "", "", - "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port -f $persistent_log_file", +@server_opts = ("", "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port -f $persistent_log_file", "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port -u .", + "", "", "", "", "", + "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port -f $persistent_log_file", "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port -u ."); @comments = ("Simple Test: \n", + "mmap() Persistent Test (Part 1): \n", + "Flat File Persistent Test (Part 1): \n", "Simple Test (using multicast to locate the server): \n", "Tree Test: \n", "Iterator Test: \n", "Exceptions Test: \n", "Destroy Test: \n", - "mmap() Persistent Test (Part 1): \n", "mmap() Persistent Test (Part 2): \n", - "Flat File Persistent Test (Part 1): \n", "Flat File Persistent Test (Part 2): \n"); $test_number = 0; @@ -110,6 +115,14 @@ foreach $o (@opts) { client ($o); $NS->Kill (); + + ## For some reason, only on Windows XP, we need to + ## wait before starting another Naming_Service when + ## the mmap persistence option is used + if ($^O eq "MSWin32") { + sleep(1); + } + $test_number++; } |