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

1 files changed, 7 insertions, 19 deletions

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";