ChangeLogTag:Sun Mar 4 19:12:59 2001 Darrell Brunsch <brunsch@uci.edu>

3 files changed, 46 insertions, 53 deletions

diff --git a/TAO/tests/Multiple/Client.dsp b/TAO/tests/Multiple/Client.dsp
index e31150b20df..c956c5d7627 100644
--- a/TAO/tests/Multiple/Client.dsp
+++ b/TAO/tests/Multiple/Client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /out:"Client.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

 !ELSEIF  "$(CFG)" == "Client - Win32 Debug"

 

diff --git a/TAO/tests/Multiple/Server.dsp b/TAO/tests/Multiple/Server.dsp
index e2e81c29774..c8d6c66f285 100644
--- a/TAO/tests/Multiple/Server.dsp
+++ b/TAO/tests/Multiple/Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Server.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "Server - Win32 Debug"

 

diff --git a/TAO/tests/Multiple/run_test.pl b/TAO/tests/Multiple/run_test.pl
index 789f921beb4..fca870955df 100755
--- a/TAO/tests/Multiple/run_test.pl
+++ b/TAO/tests/Multiple/run_test.pl
@@ -6,100 +6,93 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-require Process;
-
-
-unshift @INC, '../../../bin';
-require ACEutils;
-use Cwd;
-
+use PerlACE::Run_Test;
 
 $status = 0;
-$EXEPREFIX = "./";
-$DIRECT_COLLOC = "-ORBCollocationStrategy direct";
-$NO_COLLOC = "-ORBCollocation no";
 
-$cwd = getcwd();
+$direct_colloc = "-ORBCollocationStrategy direct";
+$no_colloc = "-ORBCollocation no";
+
+# @todo Test should take -o and -k options to specify iorfile
+# Hard coded in test.
+$iorfile = "s.ior";
 
-$iorfile = "$cwd$DIR_SEPARATOR" . "s.ior";
 unlink $iorfile;
 
-ACE::checkForTarget($cwd);
+$SV = new PerlACE::Process ("server");
+$CL = new PerlACE::Process ("client");
 
 #
 # Test using ThruPOA collocation.
 #
 
+$SV->Spawn ();
 
-$Server = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-			   "");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $Server->Kill (); $Server->TimedWait (1);
-  exit 1;
+if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); 
+    exit 1;
 }
 
+$client = $CL->SpawnWaitKill (60);
 
-$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
+$SV->Kill ();
 
-if ($Client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $Client->Kill (); 
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-$Server->Kill ();
-
-
 #
 # Test using Direct Collocation
 #
 
 unlink $iorfile;
 
-$Server = Process::Create ($EXEPREFIX."server$EXE_EXT", $DIRECT_COLLOC);
+$SV->Arguments ($direct_colloc);
+
+$SV->Spawn ();
 
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $Server->Kill (); $Server->TimedWait (1);
-  exit 1;
+if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); 
+    exit 1;
 }
 
+$client = $CL->SpawnWaitKill (60);
 
-$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
+$SV->Kill ();
 
-if ($Client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = $status+1;
-  $Client->Kill (); 
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-$Server->Kill ();
-
 #
 # Test using No Collocation
 #
 
 unlink $iorfile;
 
-$Server = Process::Create ($EXEPREFIX."server$EXE_EXT", $NO_COLLOC);
+$SV->Arguments ($no_colloc);
 
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $Server->Kill (); $Server->TimedWait (1);
-  exit 1;
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); 
+    exit 1;
 }
 
+$client = $CL->SpawnWaitKill (60);
 
-$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
+$SV->Kill ();
 
-if ($Client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = $status+1;
-  $Client3->Kill (); 
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
 }
 
-$Server->Kill ();
+unlink $iorfile;
 
 exit $status