ChangeLogTag:Sat Nov 10 23:13:37 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 65 insertions, 52 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9783d3ad5f2..cfc5d303239 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Sat Nov 10 23:13:37 2001  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/tests/Security/Secure_Invocation/run_test.pl:
+	* orbsvcs/tests/Security/SecurityLevel1/run_test.pl:
+
+	  Updated/modernized these scripts to conform to our current
+	  regression test script conventions.
+
 Sat Nov 10 23:06:13 2001  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/tests/Security/Big_Request/Big_Request.dsw:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
index 82e7f352d19..b7a78e13b05 100755
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
@@ -5,46 +5,49 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use Env (ACE_ROOT);
 
-unshift @INC, "$ACE_ROOT/bin";
-require ACEutils;
+use lib  '../../../../../bin';
+use PerlACE::Run_Test;
+
+$status = 0;
+$file = PerlACE::LocalFile ("test.ior");
+
+unlink $file;
 
 $status = 0;
 
 # Set the SSL environment
 $ENV{'SSL_CERT_FILE'} = 'cacert.pem';
 
-$iorfile = "server.ior";
-unlink $iorfile;
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -ORBSvcConf server.conf "
-                       . " -o $iorfile");
+$SV = new PerlACE::Process ("server",
+			    "-o $file -ORBSvcConf server.conf");
+$CL = new PerlACE::Process ("client",
+			    "-ORBSvcConf client.conf -k file://$file");
 
-if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
+print STDERR "\n\n==== Running Secure_Invocation test\n";
+
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+    print STDERR "ERROR: cannot find file <$file>\n";
+    $SV->Kill ();
+    exit 1;
 }
 
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-                       " -ORBSvcConf client.conf "
-                       . " -k file://$iorfile");
+$client = $CL->SpawnWaitKill (60);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-$server = $SV->TimedWait (15);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
+$server = $SV->WaitKill (5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
 }
 
-unlink $iorfile;
+unlink $file;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl b/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl
index 33a3d13c37e..3e522f16c9f 100755
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl
@@ -5,46 +5,48 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use Env (ACE_ROOT);
+use lib  '../../../../../bin';
+use PerlACE::Run_Test;
 
-unshift @INC, "$ACE_ROOT/bin";
-require ACEutils;
+$status = 0;
+$file = PerlACE::LocalFile ("test.ior");
+
+unlink $file;
 
 $status = 0;
 
 # Set the SSL environment
 $ENV{'SSL_CERT_FILE'} = 'ca.pem';
 
-$iorfile = "server.ior";
-unlink $iorfile;
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -ORBSvcConf server.conf "
-                       . " -o $iorfile");
+$SV = new PerlACE::Process ("server",
+			    "-o $file -ORBSvcConf server.conf");
+$CL = new PerlACE::Process ("client",
+			    "-ORBSvcConf client.conf -k file://$file");
+
+print STDERR "\n\n==== Running SecurityLevel1 test\n";
 
-if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+    print STDERR "ERROR: cannot find file <$file>\n";
+    $SV->Kill ();
+    exit 1;
 }
 
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-                       " -ORBSvcConf client.conf "
-                       . " -k file://$iorfile");
+$client = $CL->SpawnWaitKill (60);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-$server = $SV->TimedWait (15);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
+$server = $SV->WaitKill (5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
 }
 
-unlink $iorfile;
+unlink $file;
 
 exit $status;