Thu Dec 6 14:56:14 2001 Justin Michel <michel_j@ociweb.com>

8 files changed, 32 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7c3a3216c5c..b254d136cfd 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,24 @@
+Thu Dec  6 14:56:14 2001  Justin Michel  <michel_j@ociweb.com>
+
+        * TAO/tests/TAO_Tests.dsw
+        * TAO/tests/ORB_init/makefile.bor
+        * TAO/tests/ORB_init/Portspan/README
+        * TAO/tests/ORB_init/Portspan/run_test.pl
+        * TAO/tests/ior_corbaloc/IOR CorbaLoc Client.dsp
+        * TAO/tests/ior_corbaloc/IOR CorbaLoc Server.dsp
+        * TAO/tests/ior_corbaloc/IOR CorbaName Client.dsp
+        * TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp
+        * TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp
+        * TAO/tests/ior_corbaloc/ior_corbaname_client.dsp
+
+        Removed spaces from the filenames for the corbaloc tests.
+        Updated the readme file and fixed a few typos in the
+        portspan test.
+        Tried to update the borland project to recurse into the
+        portspan test directory. 
+        Note : The portspan test is not set up to run nightly, but
+        it will at least build. 
+
 Thu Dec  6 11:05:14 2001  Justin Michel  <michel_j@ociweb.com>
 
         * TAO/tests/TAO_Tests.dsw
diff --git a/TAO/tests/ORB_init/Portspan/README b/TAO/tests/ORB_init/Portspan/README
index 5a5c106c608..8eb4f91abd0 100644
--- a/TAO/tests/ORB_init/Portspan/README
+++ b/TAO/tests/ORB_init/Portspan/README
@@ -3,24 +3,14 @@
 portspan Test
 -------------
 
-The portspan test verifies that the portspan option to ORB_init() call
-behaves correctly. This option allows to restrict the port that a 
+The portspan test verifies that the portspan option to the ORB_init() call
+behaves correctly. This option allows you to restrict the port that a 
 server-side ORB will use to listen for IIOP requests, from a given range
 of port numbers, starting at a given initial port.
 
-This test tests the following four test cases.
-1) Checks if the server has been started at the first free port available
-in the range.
-2) Checks if the server has been started at the first free port 
-available after explicitly making some of the ports within the range 
-unavailable.
-3) Checks if the server has been started at the first free port 
-available after explicitly making all but the last ports within the range 
-unavailable.
-4) See if BAD_PARAM exception is raised if all ports within the
-range are unavailable. 
+The test works by starting a simple ORB on an endpoint with a portspan of 2.
+server -ORBEndpoint iiop://:5555/portspan=2
+The test script does this three times and reports an error if the first two
+don't succeed, or if the third call doesn't fail. 
 
-To run the test:
-
-./run_test.pl <initial port> <port range>
 
diff --git a/TAO/tests/ORB_init/Portspan/run_test.pl b/TAO/tests/ORB_init/Portspan/run_test.pl
index ea180e78ae7..5d899208196 100755
--- a/TAO/tests/ORB_init/Portspan/run_test.pl
+++ b/TAO/tests/ORB_init/Portspan/run_test.pl
@@ -20,7 +20,7 @@ if ($test1 != 0) {
 
 $test2 = $P2->Spawn();
 if ($test2 != 0) {
-    print STDERR "ERROR: Couldn't start first server. Err:$test2\n";
+    print STDERR "ERROR: Couldn't start second server. Err:$test2\n";
     $P1->Kill();
     $P2->Kill();
     exit 1;
diff --git a/TAO/tests/ORB_init/makefile.bor b/TAO/tests/ORB_init/makefile.bor
index a1db0624f77..dc7fa44514f 100644
--- a/TAO/tests/ORB_init/makefile.bor
+++ b/TAO/tests/ORB_init/makefile.bor
@@ -23,5 +23,6 @@ LIBFILES = \
   
 CPPDIR = .
 
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
   
diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw
index 48b9015a58d..32701076647 100644
--- a/TAO/tests/TAO_Tests.dsw
+++ b/TAO/tests/TAO_Tests.dsw
@@ -747,7 +747,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOR CorbaLoc Client"=".\IOR_CORBALOC\IOR CorbaLoc Client.dsp" - Package Owner=<4>

+Project: "IOR CorbaLoc Client"=.\ior_corbaloc\ior_corbaloc_client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -759,7 +759,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOR CorbaLoc Server"=".\IOR_CORBALOC\IOR CorbaLoc Server.dsp" - Package Owner=<4>

+Project: "IOR CorbaLoc Server"=.\ior_corbaloc\ior_corbaloc_server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -771,7 +771,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOR CorbaName Client"=".\IOR_CORBALOC\IOR CorbaName Client.dsp" - Package Owner=<4>

+Project: "IOR CorbaName Client"=.\ior_corbaloc\ior_corbaname_client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/ior_corbaloc/IOR CorbaLoc Client.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp
index ced88d770e9..ced88d770e9 100644
--- a/TAO/tests/ior_corbaloc/IOR CorbaLoc Client.dsp
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp
diff --git a/TAO/tests/ior_corbaloc/IOR CorbaLoc Server.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp
index ee9c09fd3bc..ee9c09fd3bc 100644
--- a/TAO/tests/ior_corbaloc/IOR CorbaLoc Server.dsp
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp
diff --git a/TAO/tests/ior_corbaloc/IOR CorbaName Client.dsp b/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp
index 99afc8efd8c..99afc8efd8c 100644
--- a/TAO/tests/ior_corbaloc/IOR CorbaName Client.dsp
+++ b/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp