1 files changed, 22 insertions, 18 deletions

diff --git a/TAO/tests/DII_Collocation_Tests/twoway/run_test.pl b/TAO/tests/DII_Collocation_Tests/twoway/run_test.pl
index f08dc61f230..789b1121a62 100755
--- a/TAO/tests/DII_Collocation_Tests/twoway/run_test.pl
+++ b/TAO/tests/DII_Collocation_Tests/twoway/run_test.pl
@@ -8,73 +8,77 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-$simple_testfile = PerlACE::LocalFile ("simple_test.ior");
-unlink $iorfile;
-unlink $simple_testfile;
+$iorbase = "test.ior";
 $status = 0;
 
-$SV = new PerlACE::Process ("Collocated_Test");
+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;
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
 
 print STDERR "======== Running with per-orb \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
 
 print STDERR "======== Running with no collocation \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation no");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
 
 print STDERR "======== Running in default mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n ");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
 
 print STDERR "======== Running in per-orb mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
+    print STDERR "ERROR in DII Collocated twoway test\n";
     $status = 1;
 }
 unlink $iorfile;
-unlink $simple_testfile;
 
 exit $status;