Fri Nov 28 11:27:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 20 insertions, 23 deletions

diff --git a/TAO/tests/Collocation_Oneway_Tests/run_test.pl b/TAO/tests/Collocation_Oneway_Tests/run_test.pl
index fd16f22ab2f..cc6f2620891 100755
--- a/TAO/tests/Collocation_Oneway_Tests/run_test.pl
+++ b/TAO/tests/Collocation_Oneway_Tests/run_test.pl
@@ -6,59 +6,56 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target(1) || die "Create target 1 failed\n";
 
-$status = 0;
 $iorbase = "test.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$status = 0;
 
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("Collocated_Test");
-    $iorfile = $iorbase;
-}
-else {
-    $SV = new PerlACE::Process ("Collocated_Test");
-    $iorfile = PerlACE::LocalFile ($iorbase);
-}
-unlink $iorfile;
+$SV = $server->CreateProcess ("Collocated_Test");
 
 print STDERR "======== Running in Default Mode \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -m none ");
-$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+$SV->Arguments ("-o $server_iorfile -k file://$server_iorfile -m none ");
+$sv = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
     $status = 1;
 }
-unlink $iorfile;
+$server->DeleteFile($iorbase);
 
 print STDERR "======== Running in Default Mode \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -m transport");
-$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+$SV->Arguments ("-o $server_iorfile -k file://$server_iorfile -m transport");
+$sv = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
     $status = 1;
 }
-unlink $iorfile;
+$server->DeleteFile($iorbase);
 
 print STDERR "======== Running in Default Mode \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -m server");
-$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+$SV->Arguments ("-o $server_iorfile -k file://$server_iorfile -m server");
+$sv = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
     $status = 1;
 }
-unlink $iorfile;
+$server->DeleteFile($iorbase);
 
 print STDERR "======== Running in Default Mode \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -m target");
-$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+$SV->Arguments ("-o $server_iorfile -k file://$server_iorfile -m target");
+$sv = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
     $status = 1;
 }
-unlink $iorfile;
+$server->DeleteFile($iorbase);
+$server->GetStderrLog();
 
 exit $status;