diff options
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests')
7 files changed, 48 insertions, 15 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl b/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl index 399443c5b71..c0af92a175e 100755 --- a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -106,7 +111,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", # "-ORBNegotiateCodesets 0 " . "-p $iorfname_prefix " . "-s $num_servants " . @@ -117,7 +122,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", # "-ORBNegotiateCodesets 0 " . "-p $iorfname_prefix " . "-s $num_servants " . diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl index 120e983cff2..38d2117126f 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl @@ -8,6 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $baseior = "server.ior"; $iorfile = PerlACE::LocalFile ("$baseior"); unlink $iorfile; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl index 7da2894591d..7094eb43bc7 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -105,7 +110,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -115,7 +120,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -146,11 +151,11 @@ my $count = 0; for ($i = 0; $i < $num_remote_clients; $i++) { - + $client_id = $i+1; $j = $i % $num_servants; - + $CLS[$i] = new PerlACE::Process("client_main", "-i file://$iorfile[$j] ". "-k $client_kind ". diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl index 11e3ef02dd6..18860b82c92 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -106,7 +111,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -116,7 +121,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -155,7 +160,7 @@ for ($i = 0; $i < $num_remote_clients; $i++) "-k $client_kind ". "-n $client_id"); # print STDERR $CLS[$i]->CommandLine() . "\n"; - + $CLS[$i]->Spawn(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl index be5769d3558..400c8228402 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -111,7 +116,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -122,7 +127,7 @@ if (PerlACE::is_vxworks_test()) { } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -151,11 +156,11 @@ my $count = 0; for ($i = 0; $i < $num_remote_clients; $i++) { - + $client_id = $i+1; $j = $i % $num_servants; - + $CLS[$i] = new PerlACE::Process("client_main", "-i file://$iorfile[$j] ". "-k $client_kind ". diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl index fee5bc7bc29..84e58ce81b0 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $status = 0; $iorfile = PerlACE::LocalFile ("server.ior"); @@ -20,7 +25,7 @@ else { $SV = new PerlACE::Process ("server", "-o $iorfile"); } $CL = new PerlACE::Process ("client", " -k file://$iorfile"); - + $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, @@ -28,7 +33,7 @@ if (PerlACE::waitforfile_timed ($iorfile, print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client = $CL->SpawnWaitKill (300); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl index 908cfa341f9..19a0b761811 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $iorfilebase = "server.ior"; $iorfile = PerlACE::LocalFile ("$iorfilebase"); unlink $iorfile; |