Mon Nov 17 13:46:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 17 insertions, 27 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1c2c05f1ac0..fb613fb2cba 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 17 13:46:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * testst/Bug_3299_Regression/run_test.pl:
+          Fixed bug in this file which I introduced by mistake
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
+          Converted to the new test framework
+
 Mon Nov 17 13:11:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DevGuideExamples/PortableInterceptors/PICurrent_NameService:
diff --git a/TAO/tests/Bug_3299_Regression/run_test.pl b/TAO/tests/Bug_3299_Regression/run_test.pl
index 31ecd055070..825f9fcf4dc 100755
--- a/TAO/tests/Bug_3299_Regression/run_test.pl
+++ b/TAO/tests/Bug_3299_Regression/run_test.pl
@@ -29,6 +29,8 @@ $client->DeleteFile($iorbase);
 $SV = $server->CreateProcess ("server", "-ORBObjRefStyle URL -ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "-k file://$client_iorfile");
 
+$server_status = $SV->Spawn ();
+
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
index 2a580aaddb6..bb9eee46220 100755
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
@@ -6,37 +6,17 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
 
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
-unlink $file;
+$SV = $server->CreateProcess ("Collocated_Test", "-ORBObjRefStyle url");
 
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("Collocated_Test", "-ORBObjRefStyle url");
-}
-else {
-    $SV = new PerlACE::Process ("Collocated_Test", "-ORBObjRefStyle url");
-}
-
-print STDERR "\n\n==== Running interceptor collocated Dynamic test\n";
-
-$SV->Spawn ();
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
-if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
     exit 1;
 }
 
-$collocated = $SV->WaitKill (5);
-
-if ($collocated != 0) {
-    print STDERR "ERROR: Collocated_Test returned $collocated\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
+exit 0;