ChangeLogTag:Wed Jul 29 12:32:48 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

17 files changed, 421 insertions, 177 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index bdd4121f18b..47e5cdd1e7a 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,33 @@
+Wed Jul 29 12:32:48 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tests/Param_Test/run_test.pl: 
+	* tests/NestedUpcall/Triangle_Test/run_test.pl: 
+	* tests/NestedUpcall/MT_Client_Test/run_test.pl: 
+	* tests/Simple/run_test.pl: 
+	* tests/Cubit/TAO/IDL_Cubit/run_test.pl: 
+	* tests/Cubit/TAO/DII_Cubit/run_test.pl: 
+	  Use unlink instead of system("rm") or system("del").
+
+	* tests/Cubit/TAO/Makefile: 
+	* tests/Cubit/TAO/DII_Cubit/Makefile: 
+	  Added DII_Cubit to the default compilation.
+
+	* tests/Cubit/TAO/MT_Cubit/run_test.pl: 
+	  Added a one-button test.
+
+	* tests/NestedUpcall/MT_Client_Test/client.h: 
+	* tests/NestedUpcall/MT_Client_Test/client.cpp: 
+	  Instead of using the thread id to decide which server we use
+	  each client thread is assigned a number, even threads choose the
+	  first server, odd threads the second one.  The thread id
+	  approach was non-portable.
+
+	* tests/POA/RootPOA/README: 
+	* tests/POA/FindPOA/README: 
+	* tests/POA/NewPOA/README: 
+	  Updated this files, the tests don't print warning messages about
+	  the svc.conf file anymore (actually the ORB doesn't).
+
 Wed Jul 29 08:58:01 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_field/{field_ci, field_cs}.cpp: Added code
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
new file mode 100755
index 00000000000..f3b9391e9d5
--- /dev/null
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -0,0 +1,31 @@
+# $Id$
+# -*- perl-mode -*-
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+unshift @INC, '../../../../../bin';
+require Process;
+
+$server_port = 0;
+$iorfile = "theior";
+$sleeptime = 3;
+
+$SV = Process::Create ("server".$Process::EXE_EXT, 
+                       " -ORBport ".$server_port.
+		       " -ORBobjrefstyle url".
+		       " -s -f $iorfile");
+
+sleep $sleeptime;
+
+$status = system ("client".$Process::EXE_EXT.
+		  " -x -s -f $iorfile");
+
+
+# @@ TODO change to Wait() once the -x option works.
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
+
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/release.chk b/TAO/release.chk
index dc8fff52e2f..1e644c037f2 100644
--- a/TAO/release.chk
+++ b/TAO/release.chk
@@ -23,15 +23,15 @@ Legend:
         c = compiles but does not work correctly
         x = not attempted or unknown
         P = Purified
- 		   
+ 	           
  A B C D E F G H   
 [1 1 x 1 x 1 1 x] libTAO compiles
 [1 1 x 1 x 1 1 x] TAO_IDL compiles
 [1 1 x 1 x 1 1 x] liborbsvcs compiles
        	           
-[1 1 x 1 x 1 x x] IDL_Cubit server
-[1 1 x 1 x 1 x x] IDL_Cubit client
-[x c x x x x x x] DII_Cubit client
+[1 1 x 1 x 1 c x] IDL_Cubit server
+[1 1 x 1 x 1 c x] IDL_Cubit client
+[x c x c x c c x] DII_Cubit client
        	           
 [1 1 x 1 x 1 1 x] Param_Test compiles
 [1 1 x 1 x 1 1 x]    SII short
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
index af587d40f98..251b82c23f0 100644
--- a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
@@ -67,6 +67,240 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
+ $(ACE_ROOT)/ace/Env_Value_T.h \
+ $(ACE_ROOT)/ace/Env_Value_T.i \
+ $(ACE_ROOT)/ace/Env_Value_T.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ ../IDL_Cubit/cubitC.h ../IDL_Cubit/cubitC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
index 259f3dde358..f3e5d5ba27a 100755
--- a/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -1,4 +1,5 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -6,44 +7,25 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../../bin';
 require Process;
 
-if ($^O eq "MSWin32")
-{
-  system ("ipconfig | find \"Address\">ipnum");
-
-  open (IPNUM, "ipnum");
-
-  read (IPNUM, $line, 80);
-
-  ($junk, $ip1, $ip2, $ip3, $ip4) = split (/: (\d+)\.(\d+)\.(\d+)\.(\d+)/, $line);
-
-  close IPNUM;
-
-  system ("del /q ipnum");
-
-  $uid = $ip4;
-}
-else
-{
-  $uid = getpwnam (getlogin ());
-}
-
-$nsport = 20000 + $uid;
 $client_port = 0;
 $server_port = 0;
+$iorfile = "theior";
 
 $SV = Process::Create ("..$DIR_SEPARATOR"."IDL_Cubit".
 		       $DIR_SEPARATOR."server".$Process::EXE_EXT, 
                        " -ORBport ".$server_port.
-		       " -ORBnameserviceport ".$nsport.
-		       " -ORBobjrefstyle url");
+		       " -ORBobjrefstyle url".
+		       " -s -f $iorfile");
 
 sleep (2);
 
 $status = system ("client".$Process::EXE_EXT.
-		  " -x -ORBnameserviceport ".$nsport.
-		  " -ORBobjrefstyle url -ORBport ".$client_port );
+		  " -ORBport $client_port".
+		  " -s -f $iorfile -x");
 
 # @@ TODO change to Wait() once the -x option works.
-$SV->Kill ();
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
 
 exit $status;
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 0abbe864779..8bf73f21f1d 100755
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -1,32 +1,31 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
 unshift @INC, '../../../../../bin';
 require Process;
-require Uniqueid;
 
-$nsport = 20000 + uniqueid ();
-$client_port = 0;
 $server_port = 0;
 $iorfile = "theior";
 $sleeptime = 3;
 
 $SV = Process::Create ("server".$Process::EXE_EXT, 
                        " -ORBport ".$server_port.
-		       " -ORBnameserviceport ".$nsport.
-		       " -ORBobjrefstyle url");
+		       " -ORBobjrefstyle url".
+		       " -s -o $iorfile");
 
-sleep ($sleeptime);
+sleep $sleeptime;
 
 $status = system ("client".$Process::EXE_EXT.
-		  " -x -ORBnameserviceport ".$nsport.
-		  " -ORBport ".$client_port );
+		  " -s -f $iorfile -x");
 
 
 # @@ TODO change to Wait() once the -x option works.
-$SV->Kill ();
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
 
 # @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl
new file mode 100755
index 00000000000..f3b9391e9d5
--- /dev/null
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -0,0 +1,31 @@
+# $Id$
+# -*- perl-mode -*-
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+unshift @INC, '../../../../../bin';
+require Process;
+
+$server_port = 0;
+$iorfile = "theior";
+$sleeptime = 3;
+
+$SV = Process::Create ("server".$Process::EXE_EXT, 
+                       " -ORBport ".$server_port.
+		       " -ORBobjrefstyle url".
+		       " -s -f $iorfile");
+
+sleep $sleeptime;
+
+$status = system ("client".$Process::EXE_EXT.
+		  " -x -s -f $iorfile");
+
+
+# @@ TODO change to Wait() once the -x option works.
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
+
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/tests/Cubit/TAO/Makefile b/TAO/tests/Cubit/TAO/Makefile
index 132ad1b6382..f5c52349620 100644
--- a/TAO/tests/Cubit/TAO/Makefile
+++ b/TAO/tests/Cubit/TAO/Makefile
@@ -10,12 +10,8 @@
 
 # Currently, IDL_Cubit *must* come before the IDL_Cubit tests.
 DIRS  = IDL_Cubit \
-	MT_Cubit
-
-# These are disabled by default...
-# DII_Cubit \
-# Orbix \
-# VisiBroker
+	MT_Cubit \
+	DII_Cubit \
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 2f069b80409..b2f00302b98 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -24,10 +24,11 @@
 #include "local_server.h"
 
 
-MT_Client_Task::MT_Client_Task (int argc,
-                                char **argv)
+MT_Client_Task::MT_Client_Task (int argc, char **argv,
+				int client_number)
   : argc_ (argc),
-    argv_ (argv)
+    argv_ (argv),
+    client_number_ (client_number)
 {
 }
 
@@ -35,7 +36,8 @@ int
 MT_Client_Task::svc (void)
 {
   if (this->mT_Client_.init (this->argc_,
-                             this->argv_) == -1)
+                             this->argv_,
+			     this->client_number_) == -1)
     return 1;
   else
     return this->mT_Client_.run ();
@@ -93,7 +95,7 @@ MT_Client::parse_args (void)
         break;
         // Depending on the thread ID we pick the IOR
       case 'f': // read the IOR from the file.
-        if ((this->thread_ID_ % 2) == 0)
+        if ((this->client_number_ % 2) == 0)
         {
           result = this->read_ior (get_opts.optarg);
           // read IOR for MT Object
@@ -105,7 +107,7 @@ MT_Client::parse_args (void)
         }
         break;
       case 'g': // read the IOR from the file.
-        if ((this->thread_ID_ % 2) == 1)
+        if ((this->client_number_ % 2) == 1)
         {
           result = this->read_ior (get_opts.optarg);
           // read IOR for Object A
@@ -180,8 +182,8 @@ MT_Client::~MT_Client (void)
 
 
 int
-MT_Client::init (int argc,
-                 char **argv)
+MT_Client::init (int argc, char **argv,
+		 int client_number)
 {
 
   // Make a copy of argv since ORB_init will change it.
@@ -191,9 +193,7 @@ MT_Client::init (int argc,
     this->argv_[i] = argv[i];
 
 
-  // This has to be a reinterpret_cast on platforms that define
-  // ACE_thread_t as a pointer, such as DU 4.0.
-  this->thread_ID_ = ACE_reinterpret_cast (unsigned long, ACE_Thread::self ());
+  this->client_number_ = client_number;
 
   TAO_TRY
   {
@@ -286,8 +286,7 @@ main (int argc, char **argv)
   MT_Client_Task **clients = new MT_Client_Task*[threads];
 
   for (i = 0; i < threads; i++)
-    clients[i] = new MT_Client_Task (argc,
-                                     argv);
+    clients[i] = new MT_Client_Task (argc, argv, i);
 
   for (i = 0; i < threads; i++)
     clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index 29739ddbd18..b46b41f6d79 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -44,7 +44,8 @@ public:
   // Execute client example code.
 
   int init (int argc, 
-            char **argv);
+            char **argv,
+	    int client_number);
   // Initialize the client communication endpoint with server.
 
 private:
@@ -72,8 +73,8 @@ private:
   CORBA::ORB_var orb_var_;
   // Remember our orb.
 
-  unsigned long thread_ID_;
-  // thread ID :-)
+  int client_number_;
+  // This is used to choose the server...
 
   unsigned long iterations_;
   // number of loops
@@ -88,8 +89,7 @@ class MT_Client_Task : public ACE_Task<ACE_SYNCH>
   // = DESCRIPTION
   //    No big purpose, just wrapping
 public:
-  MT_Client_Task (int argc, 
-                  char **argv);
+  MT_Client_Task (int argc, char **argv, int client_number);
 
   virtual int svc (void);
 
@@ -97,6 +97,9 @@ private:
   MT_Client mT_Client_;
   int argc_;
   char **argv_;
+
+  int client_number_;
+  // To determine if we use the first or the second server.
 };
 
 #endif /* MT_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index f7c645a6523..445a2201539 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -1,4 +1,5 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -6,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../bin';
 require Process;
 
-$client_port = 0;
 $server1_port = 0;
 $server2_port = 0;
 $ior1file = "theior1";
@@ -21,25 +21,17 @@ $SV2 = Process::Create ("server".$Process::EXE_EXT,
                         " -ORBport $server2_port -o $ior2file ".
 			" -ORBobjrefstyle url");
 
-sleep ($sleeptime);
+sleep $sleeptime;
 
 $status = system ("client".$Process::EXE_EXT.
 		  " -ORBport $client_port ".
 		  " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
 
-$SV1->Kill ();
-$SV2->Kill ();
-
-if ($^O eq "MSWin32")
-{
-  system ("del ".$ior1file);
-  system ("del ".$ior2file);
-}
-else
-{
-  system ("rm ".$ior1file);
-  system ("rm ".$ior2file);
-}
+$SV1->Kill (); $SV1->Wait ();
+$SV2->Kill (); $SV2->Wait ();
+
+unlink $ior1file;
+unlink $ior2file;
 
 # @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index fc911d4e36a..6b903ee9200 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -1,4 +1,5 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -6,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../bin';
 require Process;
 
-$client_port = 0;
 $server1_port = 0;
 $server2_port = 0;
 $ior1file = "theior1";
@@ -21,25 +21,17 @@ $SV2 = Process::Create ("server_B".$Process::EXE_EXT,
                         " -ORBport $server2_port -o $ior2file ".
 			" -ORBobjrefstyle url");
 
-sleep ($sleeptime);
+sleep $sleeptime;
 
 $status = system ("initiator".$Process::EXE_EXT.
 		  " -ORBport $client_port ".
 		  " -f $ior1file -g $ior2file");
 
-$SV1->Kill ();
-$SV2->Kill ();
-
-if ($^O eq "MSWin32")
-{
-  system ("del ".$ior1file);
-  system ("del ".$ior2file);
-}
-else
-{
-  system ("rm ".$ior1file);
-  system ("rm ".$ior2file);
-}
+$SV1->Kill (); $SV1->Wait ();
+$SV2->Kill (); $SV2->Wait ();
+
+unlink $ior1file;
+unlink $ior2file;
 
 # @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/tests/POA/FindPOA/README b/TAO/tests/POA/FindPOA/README
index 8895bb62512..40ba96f4f1d 100644
--- a/TAO/tests/POA/FindPOA/README
+++ b/TAO/tests/POA/FindPOA/README
@@ -7,23 +7,32 @@ Executable:	FindPOA
 
 Description:
 ===========
-	This is a program to test the findPOA method of the POA. It makes use of TAO_Adapter_Activator.
-	Adapter activators are associated with POAs. An adapter activator supplies a POA with the ability to create child POAs on demand
-	, as a side-effect of receiving a request that names the child POA (or one of its children),
-	or when find_POA is called with an activate parameter value of TRUE. An application server that creates
-	 all its needed POAs at the beginning of execution does not need to use or provide an adapter activator;
-	 it is necessary only for the case in which POAs need to be created during request processing.
-		TAO_Adapter_Activator takes a '/' (backslash) separated string of POA names and creates them
-	in a hierarchy with the left most substring as the root of that hierarchy.
-
-		The test program tests the "findPOA" method in RootPOA with a single POA named "firstPOA" and
-	then with a POA namestring "firstPOA/secondPOA". In the second case the secondPOA is
-	non-existent and is created.
-		Finally the findPOA method in RootPOA is called with a string "thirdPOA/forthPOA/fifthPOA",
-	resulting in the creation of thirdPOA,forthPOA and a fifthPOA and returns the fifthPOA.
-
-	To check the findPOA method the names of the POA are queried and printed on the screen. POAs hold only the
-	name relative to its parent. For eg. the name of fifthPOA is just "fifthPOA" and NOT "RootPOA/thirdPOA/forthPOA/fifthPOA".
+	This is a program to test the findPOA method of the POA. It
+makes use of TAO_Adapter_Activator.
+	Adapter activators are associated with POAs. An adapter
+activator supplies a POA with the ability to create child POAs on
+demand, as a side-effect of receiving a request that names the child
+POA (or one of its children), or when find_POA is called with an
+activate parameter value of TRUE. An application server that creates
+all its needed POAs at the beginning of execution does not need to use
+or provide an adapter activator; it is necessary only for the case in
+which POAs need to be created during request processing.
+	TAO_Adapter_Activator takes a '/' (backslash) separated string
+of POA names and creates them in a hierarchy with the left most
+substring as the root of that hierarchy.
+
+	The test program tests the "findPOA" method in RootPOA with a
+single POA named "firstPOA" and then with a POA namestring
+"firstPOA/secondPOA". In the second case the secondPOA is non-existent
+and is created. 
+	Finally the findPOA method in RootPOA is called with a string
+"thirdPOA/forthPOA/fifthPOA", resulting in the creation of
+thirdPOA,forthPOA and a fifthPOA and returns the fifthPOA.
+
+	To check the findPOA method the names of the POA are queried
+and printed on the screen. POAs hold only the name relative to its
+parent. For eg. the name of fifthPOA is just "fifthPOA" and NOT
+"RootPOA/thirdPOA/forthPOA/fifthPOA".
 
 To Test:
 ========
diff --git a/TAO/tests/POA/NewPOA/README b/TAO/tests/POA/NewPOA/README
index 8a47ed95cfc..cfac20df0e5 100644
--- a/TAO/tests/POA/NewPOA/README
+++ b/TAO/tests/POA/NewPOA/README
@@ -13,10 +13,3 @@ Comments :
         
  - Prints out names of all the POAs.
 
- - It prints out two warning messages, since there is no Resource Factory  
-   and Strategy Factory found in the Service Repository.
-
-   It takes the default instances of the Resource and Strategy Factories.
-
-   These Default factories are ok for this simple application.
-
diff --git a/TAO/tests/POA/RootPOA/README b/TAO/tests/POA/RootPOA/README
index bf5f5f0aab5..8fabb9c4c41 100644
--- a/TAO/tests/POA/RootPOA/README
+++ b/TAO/tests/POA/RootPOA/README
@@ -8,10 +8,3 @@ Comments:
 ========
 
 - It prints out the name of the Root POA.
-
-- It prints out two warning messages, since there is no Resource Factory  and Strategy Factory
-  found in the Service Repository.
-
-  So, it takes the default instances of the Resource and Strategy Factories.
-
-  This is ok for this simple application.
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 79f8dbfcd09..83d8ff258c0 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -1,4 +1,5 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -6,29 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../bin';
 require Process;
 
-# Get the userid (or ip on NT)
-
-if ($^O eq "MSWin32")
-{
-  system ("ipconfig | find \"Address\">ipnum");
-
-  open (IPNUM, "ipnum");
-
-  read (IPNUM, $line, 80);
-
-  $ip4 = (split (/: (\d+)\.(\d+)\.(\d+)\.(\d+)/, $line))[4];
-
-  close IPNUM;
-
-  system ("del /q ipnum");
-
-  $uid = $ip4;
-}
-else
-{
-  $uid = getpwnam (getlogin ());
-}
-
 $port = 0;
 $iorfile = "theior";
 $invocation = "sii";
@@ -55,7 +33,7 @@ sub run_test
   # something that can tell if a server is still alive.  There is kill -0 on
   # Unix, but on NT ???
 
-  $SV->Kill ();
+  $SV->Kill (); $SV->Wait ();
 }
 
 # Parse the arguments
@@ -131,11 +109,4 @@ else
   }
 }
 
-if ($^O eq "MSWin32")
-{
-  system ("del ".$iorfile);
-}
-else
-{
-  system ("rm ".$iorfile);
-}
+unlink $iorfile;
diff --git a/TAO/tests/Simple/run_test.pl b/TAO/tests/Simple/run_test.pl
index 64e4da940b6..32320886d96 100755
--- a/TAO/tests/Simple/run_test.pl
+++ b/TAO/tests/Simple/run_test.pl
@@ -1,37 +1,26 @@
 #$Id$
+# -*- perl-mode -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
 unshift @INC, '../../../bin';
 require Process;
-require Uniqueid;
 
-$nsport = 20000 + uniqueid ();
-# doesn't actually use ns yet
-$client_port = 0;
 $server_port = 0;
 $iorfile = "theior";
 $sleeptime = 3;
 
 $SV = Process::Create ("server".$Process::EXE_EXT, 
-                       " -ORBport $server_port -o $iorfile ".
-		       " -ORBobjrefstyle url");
+                       " -ORBport $server_port -o $iorfile ");
 
-sleep ($sleeptime);
+sleep $sleeptime;
 
 $status  = system ("client".$Process::EXE_EXT.
-		   " -f $iorfile -x -ORBport $client_port");
-
-if ($^O eq "MSWin32")
-{
-  system ("del ".$iorfile);
-}
-else
-{
-  system ("rm ".$iorfile);
-}
-
-$SV->Wait ();
+		   " -f $iorfile -x");
+
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
 
 exit $status;