ChangeLogTag:Thu Jul 30 16:40:10 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

14 files changed, 33 insertions, 43 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 960e8a40bd2..5fd0cc0c3ec 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,20 @@
+Thu Jul 30 16:40:10 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/tests/EC_Multiple/run_test.pl: 
+	* orbsvcs/tests/EC_Throughput/run_test.pl: 
+	* orbsvcs/tests/Event_Latency/run_test.pl: 
+	* orbsvcs/tests/Simple_Naming/run_test.pl: 
+	* tests/Cubit/TAO/DII_Cubit/run_test.pl: 
+	* tests/Cubit/TAO/IDL_Cubit/run_test.pl: 
+	* tests/Cubit/TAO/MT_Cubit/run_test.pl: 
+	* tests/NestedUpcall/MT_Client_Test/run_test.pl: 
+	* tests/NestedUpcall/Triangle_Test/run_test.pl: 
+	* tests/Param_Test/run_test.pl: 
+	* tests/Quoter/run_test.pl: 
+	* tests/Simple/run_test.pl: 
+	  Removed the last calls to system("del") and minor cosmetic
+	  fixes.
+
 Thu Jul 30 15:38:52 1998  Matthew J Braun  <mjb2@cec.wustl.edu>
 
 	* orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 620ae9dab3f..0cc1a0dbf46 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -1,5 +1,5 @@
-# -*- perl-mode -*-
 # $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 93e52be7d77..2660782467c 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -1,5 +1,5 @@
-# -*- perl-mode -*-
 # $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 1a04daa9b64..f37cc8a4edb 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -1,5 +1,5 @@
-# -*- perl-mode -*-
 # $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 26c9a6cb48c..8db1f2d9c32 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -1,4 +1,5 @@
 # $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -8,37 +9,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 unshift @INC, '../../../../bin';
 require Process;
+require Uniqueid;
 
 # amount of delay between running the servers
 
 $sleeptime = 3;
 
-# Get the userid (or ip on NT)
-
-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 ());
-}
-
 # variables for parameters
 
-$nsmport = 10000 + $uid;
+$nsmport = 10000 + uniqueid ();
 
 sub name_server
 {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
index f3b9391e9d5..4f76b0bec08 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -1,5 +1,5 @@
 # $Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
index f3e5d5ba27a..c2ff53f8c7d 100755
--- a/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/TAO/tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 8bf73f21f1d..db00a493c25 100755
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl
index f3b9391e9d5..4f76b0bec08 100755
--- a/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -1,5 +1,5 @@
 # $Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index 445a2201539..9e95d871e75 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index 6b903ee9200..54a9c4ba695 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 83d8ff258c0..cb1a850214b 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/tests/Quoter/run_test.pl b/TAO/tests/Quoter/run_test.pl
index 32c3db50139..42d1be9df40 100755
--- a/TAO/tests/Quoter/run_test.pl
+++ b/TAO/tests/Quoter/run_test.pl
@@ -1,4 +1,5 @@
 # $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -239,11 +240,4 @@ if ($leave)
 }
 
 
-if ($^O eq "MSWin32")
-{
-  system ("del /q $nsiorfile");
-}
-else
-{
-  system ("rm $nsiorfile");
-}
+unlink $nsiorfile;
diff --git a/TAO/tests/Simple/run_test.pl b/TAO/tests/Simple/run_test.pl
index 32320886d96..c2fe666ff02 100755
--- a/TAO/tests/Simple/run_test.pl
+++ b/TAO/tests/Simple/run_test.pl
@@ -1,5 +1,5 @@
 #$Id$
-# -*- perl-mode -*-
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;