Sat Sep 26 07:59:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/Big_Reply/run_test.pl
        * tests/Collocated_Forwarding/run_test.pl
        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
        * tests/DiffServ/run_test.pl
        * tests/DiffServ/server.cpp
        * tests/DII_Collocation_Tests/oneway/run_test.pl
        * tests/DII_Collocation_Tests/twoway/run_test.pl
        * tests/RTCORBA/Linear_Priority/server.cpp
        * tests/RTCORBA/Persistent_IOR/run_test.pl
        * tests/RTCORBA/Persistent_IOR/server.cpp
          Various improvements for cross platform testing

1 files changed, 8 insertions, 16 deletions

diff --git a/TAO/tests/Collocated_Forwarding/run_test.pl b/TAO/tests/Collocated_Forwarding/run_test.pl
index b0ded7ffed9..859ee3b26e5 100755
--- a/TAO/tests/Collocated_Forwarding/run_test.pl
+++ b/TAO/tests/Collocated_Forwarding/run_test.pl
@@ -1,23 +1,20 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
-    if 0;  
- 
+    if 0;
+
 # $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
 print "Run server with direct collocation strategy\n";
 
-if (PerlACE::is_vxworks_test()) {
-  $SV2 = new PerlACE::ProcessVX ("server", "-d -ORBCollocationStrategy direct");
-}
-else {
-  $SV2 = new PerlACE::Process ("server", "-d -ORBCollocationStrategy direct");
-}
+$SV2 = $server->CreateProcess ("server", "-d -ORBCollocationStrategy direct");
 
-$server2 = $SV2->SpawnWaitKill (15);
+$server2 = $SV2->SpawnWaitKill ($server->ProcessStartWaitInterval());
 if ($server2 != 0) {
     print STDERR "Server with direct collocation strategy return status = $server2\n";
     exit 1;
@@ -25,14 +22,9 @@ if ($server2 != 0) {
 
 print "Run server with pass thru collocation strategy\n";
 
-if (PerlACE::is_vxworks_test()) {
-  $SV1 = new PerlACE::ProcessVX ("server", "");
-}
-else {
-  $SV1 = new PerlACE::Process ("server", "");
-}
+$SV1 = $server->CreateProcess ("server");
 
-$server1 = $SV1->SpawnWaitKill (15);
+$server1 = $SV1->SpawnWaitKill ($server->ProcessStartWaitInterval());
 if ($server1 != 0) {
     print STDERR "Server with thru poa collocation strategy return status = $server1\n";
     exit 1;