Sun Feb 24 19:44:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 39 insertions, 77 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
index bff7dd8e2c4..1d3f28cbae2 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
@@ -9,35 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Recursive Array length corruption test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\n";
+    exit 1;
+}
+
 if (PerlACE::waitforfile_timed ($iorfile,
      $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
index 259a742dfbf..0a98b1acc98 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
@@ -9,35 +9,27 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Forward Declared ValueType Definition test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\n";
+    exit 1;
+}
+
 if (PerlACE::waitforfile_timed ($iorfile,
      $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index 45107822a57..a4fa0b151cc 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -9,35 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Forward Declared ValueType Definition test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process (""../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\n";
+    exit 1;
+}
+
 if (PerlACE::waitforfile_timed ($iorfile,
      $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
index d934af27a35..e69a89a3611 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
@@ -38,7 +38,7 @@ $CL2 = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_ifr",
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index acae6656f7f..df64868be2d 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -14,22 +14,6 @@ $ifr_iorfile= "if_repo.ior";
 $test_idl = PerlACE::LocalFile ("test.idl");
 $includes = "-I ../../../..  -I ../../../../orbsvcs";
 
-# find the tao_ifr executable.
-# Its placement is dependent upon the OS and if MPC generated makefiles are used.
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-
-$tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr";
-if (! -e $tao_ifr . $exec_extn ) {
-    $tao_ifr = "../../../../orbsvcs/IFR_Service/tao_ifr";
-        if (! -e $tao_ifr . $exec_extn ) {
-            print STDERR "ERROR: tao_ifr compiler not found.\n";
-            exit 1;
-    }
-}
-
 for ($i = 0; $i <= $#ARGV; $i++) {
     if ($ARGV[$i] eq "-d") {
         $debug = "-d";
@@ -39,14 +23,18 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$TAO_IFR = new PerlACE::Process ($tao_ifr);
+$TAO_IFR = new PerlACE::Process ("../../../../orbsvcs/IFR_Service/tao_ifr");
 $IFR     = new PerlACE::Process ("../../../../orbsvcs/IFR_Service/IFR_Service", " -o $ifr_iorfile");
 $CL      = new PerlACE::Process ("IDL3_Test", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"
                                  . " $debug");
 
 unlink $ifr_iorfile;
 
-$IFR->Spawn ();
+$ifspawn = $IFR->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($ifr_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$ifr_iorfile>\n";
@@ -70,7 +58,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $IFR->TerminateWaitKill (5);
+$server = $IFR->TerminateWaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: IFR returned $server\n";