ChangeLogTag: Mon May 16 09:18:26 2005 Chad Elliott <elliott_c@ociweb.com>

23 files changed, 217 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 009a3fca0fa..cf0e1b6e7da 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,72 @@
+Mon May 16 09:18:26 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
+        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
+        * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc:
+        * orbsvcs/tests/Event/lib/Event_lib.mpc:
+        * orbsvcs/tests/Trading/Trading.mpc:
+
+          Removed redundant base projects.
+
+        * orbsvcs/examples/ImR/Combined_Service/test.cpp:
+
+          Modified the assertTrue macro so that it would build on LynxOS.
+
+        * orbsvcs/tests/EC_MT_Mcast/run_test.pl:
+
+          Generate a unique multicast address and port to avoid collisions
+          on the same network.
+
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
+
+          On Windows, we use a configurator file to switch from the default
+          reactor (TP) to Select MT.  The LoadManager, on Windows only,
+          requires a reactor that supports registering signal handlers and
+          the TP Reactor no longer supports that sort of thing.
+
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
+
+          Committing a change from Dale Wilson <wilson_d@ociweb.com>.
+
+          Change shut down timeout from hard coded 1 to symbolic 10
+          to eliminate intermittent timeouts on various platforms.
+
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
+
+          Committing a change from Trevor Fields <fields_t@ociweb.com>.
+
+          Added delay between iterations of the test to allow
+          complete shutdown of Naming service.  The problem showed
+          up on dual processor machines.
+
+        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
+
+          Added an include of the CosNotification library initializer header
+          to work around static construction issues on SunOS and MacOS X.
+
+        * orbsvcs/tests/Redundant_Naming/run_test.pl:
+        * orbsvcs/tests/Simple_Naming/run_test.pl:
+
+          Allow the user to determine the location of the persistence file
+          by the TMPDIR, TEMP and TMP environment variables.  This will work
+          around NFS locking issues.
+
+        * orbsvcs/tests/Simple_Naming/process-m-output.pl:
+
+          Committing a change from Yan Dai <dai_y@ociweb.com>.
+
+          Modified the test scripts to accept the empty line, the
+          "CommandLine" line and the "WARNING" lines from
+          orbsvcs/orbsvcs/Shutdown_Utilities.cpp.
+
 Mon May 16 08:25:53 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
index 62ea3052326..41a07f0f3b6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, event_skel, rtevent, rtsched {
+project : orbsvcslib, event_skel, rtevent {
   sharedname = CosEC_RtEC_Based
   dynamicflags += TAO_RTEC_COSEC_BUILD_DLL
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 8ff7f51c364..4ff62f90ad2 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -4,15 +4,17 @@
 #include "testC.h"
 
 #include <stdexcept>
-#include <sstream>
+#include "ace/SString.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
 #define assertTrue(CONDITION) \
     if (CONDITION == false) { \
-    std::ostringstream oss; \
-      oss << "Error : "#CONDITION" "__FILE__":" << __LINE__; \
-      throw std::runtime_error(oss.str()); \
-    } \
+      ACE_CString str("Error : "#CONDITION" "__FILE__":"); \
+      char line[32]; \
+      ACE_OS::sprintf(line, "%d", __LINE__); \
+      throw std::runtime_error(str.c_str()); \
+    }
 
 using namespace CORBA;
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index 2f7c48e06c2..e6245d0eac1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba, minimum_corba {
+project(RTEC_Perf): strategies, rtcorbaevent, minimum_corba {
   sharedname     = TAO_RTEC_Perf
   idlflags      += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h
   dynamicflags  += TAO_RTEC_PERF_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
index 5226fbf057c..904ca3d2fc8 100755
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
@@ -12,23 +12,27 @@ $status = 0;
 
 $svc_conf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext");
 
+$mcast_address = (int(rand(16)) + 224) . '.' . int(rand(256)) . '.' .
+                 int(rand(256)) . '.' . int(rand(256)) . ':' .
+                 (10001 + PerlACE::uniqueid());
+
 # Run two copies of the same test...
 $T1 = new PerlACE::Process ("MCast",
-                            "-ORBSvcConf $svc_conf");
+                            "-m $mcast_address -ORBSvcConf $svc_conf");
 $T2 = new PerlACE::Process ("MCast",
-                            "-ORBSvcConf $svc_conf");
+                            "-m $mcast_address -ORBSvcConf $svc_conf");
 
 $T1->Spawn ();
 $T2->Spawn ();
 
-$test1 = $T1->WaitKill (300);
+$test1 = $T1->WaitKill (600);
 
 if ($test1 != 0) {
     print STDERR "ERROR: test 1 returned $test1\n";
     $status = 1;
 }
 
-$test2 = $T2->WaitKill (300);
+$test2 = $T2->WaitKill (30);
 
 if ($test2 != 0) {
     print STDERR "ERROR: test 2 returned $test2\n";
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
index 064b1d183cf..ab40d9b39e5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: orbsvcslib, rtevent, svc_utils, iortable, portableserver {
+project: rtevent {
   sharedname = ECMcastTests
   dynamicflags   = ECMCASTTESTS_BUILD_DLL
   Header_Files {
diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
index 08b27a7f540..ebbfbdeb915 100644
--- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Event_Test_Lib): orbsvcslib, rtevent, naming, svc_utils, iortable, portableserver {
+project(Event_Test_Lib): rtevent, naming {
   sharedname   = ECTests
   dynamicflags = EC_TEST_BUILD_DLL
   Header_Files {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
index 224ffddd48c..80b2f8e1838 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
@@ -16,9 +16,16 @@ unlink $lm_ior;
 
 $status = 0;
 
+## The LoadManager needs to register signals with the ORB's reactor (on
+## Windows only) and thus can not use the TP Reactor since it doesn't
+## support that kind of thing.  So, we swith to the Select MT Reactor.
+$lm_conf = PerlACE::LocalFile ("windows$PerlACE::svcconf_ext");
+
 $init_ref = "-ORBInitRef LoadManager=file://lm.ior";
 
-$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager", "-o lm.ior");
+$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager",
+                            "-o lm.ior" . ($^O eq 'MSWin32' ?
+                                           " -ORBSvcConf $lm_conf" : ''));
 $SV = new PerlACE::Process ("server", $init_ref);
 $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
new file mode 100644
index 00000000000..06c425e3ecf
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
@@ -0,0 +1,3 @@
+# $Id $
+
+dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
new file mode 100644
index 00000000000..289810f7d22
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!-- Converted from windows.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  $Id $ -->
+ <dynamic id="Advanced_Resource_Factory" type="Service_Object">
+   <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
+ </dynamic>
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
index a2cd5fed1fc..b5fa6ef52da 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
@@ -16,9 +16,16 @@ unlink $lm_ior;
 
 $status = 0;
 
+## The LoadManager needs to register signals with the ORB's reactor (on
+## Windows only) and thus can not use the TP Reactor since it doesn't
+## support that kind of thing.  So, we swith to the Select MT Reactor.
+$lm_conf = PerlACE::LocalFile ("windows$PerlACE::svcconf_ext");
+
 $init_ref = "-ORBInitRef LoadManager=file://lm.ior";
 
-$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager", "-o lm.ior");
+$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager",
+                            "-o lm.ior" . ($^O eq 'MSWin32' ?
+                                           " -ORBSvcConf $lm_conf" : ''));
 $SV = new PerlACE::Process ("server", $init_ref);
 $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
new file mode 100644
index 00000000000..06c425e3ecf
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
@@ -0,0 +1,3 @@
+# $Id $
+
+dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
new file mode 100644
index 00000000000..289810f7d22
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!-- Converted from windows.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  $Id $ -->
+ <dynamic id="Advanced_Resource_Factory" type="Service_Object">
+   <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
+ </dynamic>
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
index 7491a5fd4ef..4795e26e74d 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
@@ -13,9 +13,16 @@ unlink $lm_ior;
 
 $status = 0;
 
+## The LoadManager needs to register signals with the ORB's reactor (on
+## Windows only) and thus can not use the TP Reactor since it doesn't
+## support that kind of thing.  So, we swith to the Select MT Reactor.
+$lm_conf = PerlACE::LocalFile ("windows$PerlACE::svcconf_ext");
+
 $init_ref = "-ORBInitRef LoadManager=file://lm.ior";
 
-$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager", "-o lm.ior");
+$LM = new PerlACE::Process ("../../../../LoadBalancer/LoadManager",
+                            "-o lm.ior" . ($^O eq 'MSWin32' ?
+                                           " -ORBSvcConf $lm_conf" : ''));
 $SV = new PerlACE::Process ("server", $init_ref);
 
 print STDERR "\n\n======== Running Manage ObjectGroup Membership Test================\n";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
new file mode 100644
index 00000000000..06c425e3ecf
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
@@ -0,0 +1,3 @@
+# $Id $
+
+dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
new file mode 100644
index 00000000000..289810f7d22
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!-- Converted from windows.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  $Id $ -->
+ <dynamic id="Advanced_Resource_Factory" type="Service_Object">
+   <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
+ </dynamic>
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index 732fb9bb9da..45597cce95a 100755
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -21,7 +21,7 @@ $status = 0;
    {
     description => "no threads",
     config => "notify_nothreads$PerlACE::svcconf_ext",
-    supplier => " -c 10 -f",
+    supplier => " -c 10 -e 10 -f",
     consumer => " -c 2 -f -e 48",
    },
    {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index a2afe852aee..415be1478fc 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -82,6 +82,8 @@ foreach $ops (@ops)
     unlink $ior;
     unlink $notifyior;
 
+    sleep (2);
+
     #################
     print "\n********** Running Structured_Consumer Test\n\n";
 
@@ -120,6 +122,8 @@ foreach $ops (@ops)
 
     unlink $ior;
     unlink $notifyior;
+
+    sleep (2);
   }
 
 
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index c57538e420a..103faefe5ad 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -6,6 +6,13 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
 
+// On SunOS 5.8 and MacOS X, the static initialization trick used
+// in the CosNotification_Serv library does not work.  Including the
+// initializer class here works around the problem.
+#if defined (sun) || defined (__APPLE__)
+#include "orbsvcs/Notify/CosNotify_Initializer.h"
+#endif /* sun || __APPLE__ */
+
 #include "tao/TimeBaseC.h"
 #include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
index d0b5146cd18..cf61aa7d89d 100755
--- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -10,6 +10,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../bin';
 use PerlACE::Run_Test;
+use Cwd;
+
+$startdir = getcwd();
 
 # Amount of delay (in seconds) between starting a server and a client
 # to allow proper server initialization.
@@ -33,6 +36,22 @@ $iorfile2 = PerlACE::LocalFile ("ns2.ior");
 
 $status = 0;
 
+## Allow the user to determine where the persistent file will be located
+## just in case the current directory is not suitable for locking.
+## We can't change the name of the persistent file because that is not
+## sufficient to work around locking problems for Tru64 when the current
+## directory is NFS mounted from a system that does not properly support
+## locking.
+foreach my $possible ($ENV{TMPDIR}, $ENV{TEMP}, $ENV{TMP}) {
+  if (defined $possible && -d $possible) {
+    if (chdir($possible)) {
+      last;
+    }
+  }
+}
+
+print "INFO: Running the test in ", getcwd(), "\n";
+
 # Make sure that the directory to use to hold the naming contexts exists
 # and is cleaned out
 if ( ! -d "NameService" ) {
@@ -46,12 +65,12 @@ else {
   unlink @allfiles;
   chdir "..";
   }
-  
+
 # Run two Naming Servers in redundant mode and one client.  Client uses iors
 # in files to find the individual copies of the Naming Servers.
 
 my $args = "-ORBEndPoint $ns_endpoint1 -o $iorfile1 -m 0 -r NameService";
-my $prog = "../../Naming_Service/Naming_Service";
+my $prog = "$startdir/../../Naming_Service/Naming_Service";
 $NS1 = new PerlACE::Process ($prog, $args);
 
 unlink $iorfile1;
@@ -60,12 +79,12 @@ $NS1->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile1, $sleeptime) == -1) {
   print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-  $NS1->Kill (); 
+  $NS1->Kill ();
   exit 1;
 }
 
 my $args = "-ORBEndPoint $ns_endpoint2 -o $iorfile2 -m 0 -r NameService";
-my $prog = "../../Naming_Service/Naming_Service";
+my $prog = "$startdir/../../Naming_Service/Naming_Service";
 $NS2 = new PerlACE::Process ($prog, $args);
 
 unlink $iorfile2;
@@ -74,12 +93,12 @@ $NS2->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile2, $sleeptime) == -1) {
   print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-  $NS2->Kill (); 
+  $NS2->Kill ();
   exit 1;
 }
 
 my $args = "-p file://$iorfile1 -q file://$iorfile2";
-my $prog = "client";
+my $prog = "$startdir/client";
 
 $CL = new PerlACE::Process ($prog, $args);
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
index d962113c0ae..c9205bda74a 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
@@ -37,6 +37,14 @@ while ($line = <DATA>)
     chomp $line;
     @words = split (/ /, $line);
 
+    # Ignore the empty line, the "CommandLine:" line and the "WARNING:" line
+    # from the orbsvcs/orbsvcs/Shutdown_Utilities.cpp.
+    if ($#words == -1 or
+        $words[0] eq "CommandLine:" or
+        $line =~ /WARNING: /) {
+      next;
+    }
+
     # Make sure the line contains expected output.
     if (not ($words[0] eq "Unbound" or
              $words[0] eq "Bound" or
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 2f52a7c86d1..28ed2918ece 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -11,6 +11,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../bin';
 use PerlACE::Run_Test;
+use Cwd;
+
+## Save the starting directory
+$startdir = getcwd();
 
 # Amount of delay (in seconds) between starting a server and a client
 # to allow proper server initialization.
@@ -37,7 +41,7 @@ $status = 0;
 sub name_server
 {
     my $args = "-ORBNameServicePort $ns_multicast_port -o $iorfile -m 1 @_";
-    my $prog = "../../Naming_Service/Naming_Service";
+    my $prog = "$startdir/../../Naming_Service/Naming_Service";
     $NS = new PerlACE::Process ($prog, $args);
 
     unlink $iorfile;
@@ -54,7 +58,7 @@ sub name_server
 sub client
 {
     my $args = "@_"." ";
-    my $prog = "client";
+    my $prog = "$startdir/client";
 
     $CL = new PerlACE::Process ($prog, $args);
 
@@ -99,6 +103,22 @@ sub client
 
 $test_number = 0;
 
+## Allow the user to determine where the persistent file will be located
+## just in case the current directory is not suitable for locking.
+## We can't change the name of the persistent file because that is not
+## sufficient to work around locking problems for Tru64 when the current
+## directory is NFS mounted from a system that does not properly support
+## locking.
+foreach my $possible ($ENV{TMPDIR}, $ENV{TEMP}, $ENV{TMP}) {
+  if (defined $possible && -d $possible) {
+    if (chdir($possible)) {
+      last;
+    }
+  }
+}
+
+print "INFO: Running the test in ", getcwd(), "\n";
+
 unlink ($persistent_ior_file, $persistent_log_file);
 
 # Run server and client for each of the tests.  Client uses ior in a
@@ -151,7 +171,7 @@ $NS->Kill ();
 unlink $iorfile;
 
 
-$errors = system ("perl process-m-output.pl $data_file 15") >> 8;
+$errors = system ("perl $startdir/process-m-output.pl $data_file 15") >> 8;
 
 if ($errors > 0) {
     $status = 1;
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index c3bce6c79df..45e75cdf6e4 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, portableserver {
+project(*Test Lib): orbsvcslib, trading_serv, naming {
   sharedname = TTest
   idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
   dynamicflags = TAO_TTEST_BUILD_DLL
@@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, porta
   }
 }
 
-project(*export test): namingexe, trading_serv, utils, portableserver {
+project(*export test): namingexe, trading_serv {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, utils, portableserver {
   }
 }
 
-project(*import test): namingexe, trading_serv, utils, portableserver {
+project(*import test): namingexe, trading_serv {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, utils, portableserver {
   }
 }
 
-project(*colocated test): namingexe, trading_serv, utils {
+project(*colocated test): namingexe, trading_serv {
   after   += Trading_Test_Lib
   libs    += TTest