diff options
-rw-r--r-- | TAO/ChangeLog | 18 | ||||
-rwxr-xr-x | TAO/tests/BiDirectional/run_test.pl | 9 | ||||
-rw-r--r-- | TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc | 4 | ||||
-rw-r--r-- | TAO/tests/Bug_2356_Regression/client.cpp | 1 | ||||
-rw-r--r-- | TAO/tests/Bug_2356_Regression/server.cpp | 1 | ||||
-rwxr-xr-x | TAO/tests/Bug_2654_Regression/run_test.pl | 2 | ||||
-rwxr-xr-x | TAO/tests/Bug_2734_Regression/run_test.pl | 2 | ||||
-rwxr-xr-x | TAO/tests/CallbackTest/run_test.pl | 4 | ||||
-rwxr-xr-x | TAO/tests/MT_BiDir/run_test.pl | 6 | ||||
-rwxr-xr-x | TAO/tests/Muxed_GIOP_Versions/run_test.pl | 7 | ||||
-rwxr-xr-x | TAO/tests/POA/EndpointPolicy/run_test.pl | 4 | ||||
-rwxr-xr-x | TAO/tests/Smart_Proxies/run_test.pl | 5 | ||||
-rwxr-xr-x | TAO/tests/Stack_Recursion/run_test.pl | 2 |
13 files changed, 46 insertions, 19 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 19f276785f6..425d6dd5c11 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Tue May 15 07:57:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/BiDirectional/run_test.pl: + * tests/Bug_2654_Regression/run_test.pl: + * tests/Bug_2734_Regression/run_test.pl: + * tests/CallbackTest/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/Muxed_GIOP_Versions/run_test.pl: + * tests/POA/EndpointPolicy/run_test.pl: + * tests/Smart_Proxies/run_test.pl: + * tests/Stack_Recursion/run_test.pl: + Improved for vxworks testing + + * tests/Bug_2356_Regression/Bug_2356_Regression.mpc: + * tests/Bug_2356_Regression/client.cpp: + * tests/Bug_2356_Regression/server.cpp: + Explicitly link in the codeset library + Tue May 15 07:36:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Param_Test/client.h: diff --git a/TAO/tests/BiDirectional/run_test.pl b/TAO/tests/BiDirectional/run_test.pl index 4b330bb1eaa..e2f180f1cc7 100755 --- a/TAO/tests/BiDirectional/run_test.pl +++ b/TAO/tests/BiDirectional/run_test.pl @@ -9,23 +9,24 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); +$iorbase = "test.ior"; +$iorfile = PerlACE::LocalFile ("$iorbase"); unlink $iorfile; if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o test.ior -i 100"); + $SV = new PerlACE::ProcessVX ("server", "-o $iorbase -i 100"); } else { $SV = new PerlACE::Process ("server", "-o $iorfile -i 100"); } -$CL = new PerlACE::Process ("client", "-k file://$iorfile"); +$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1"); $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc index 64412efab9e..d56407ee1e2 100644 --- a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc +++ b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*Server): taoserver, messaging, ami { +project(*Server): taoserver, codeset, messaging, ami { after += *idl Source_Files { ami_test_i.cpp @@ -20,7 +20,7 @@ project(*Server): taoserver, messaging, ami { } } -project(*Simple Client): taoclient, messaging, portableserver, ami { +project(*Simple Client): taoclient, codeset, messaging, portableserver, ami { after += *idl Source_Files { client.cpp diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index ace15bfadaf..ed9fba653b5 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -17,6 +17,7 @@ #include "ace/Task.h" #include "ami_testS.h" +#include "tao/Codeset/Codeset.h" ACE_RCSID (AMI, simple_client, diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp index 1ada2a0c7d9..dcfb252d2c9 100644 --- a/TAO/tests/Bug_2356_Regression/server.cpp +++ b/TAO/tests/Bug_2356_Regression/server.cpp @@ -14,6 +14,7 @@ #include "ami_test_i.h" +#include "tao/Codeset/Codeset.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_2654_Regression/run_test.pl b/TAO/tests/Bug_2654_Regression/run_test.pl index d4110fcaef3..d74589928ba 100755 --- a/TAO/tests/Bug_2654_Regression/run_test.pl +++ b/TAO/tests/Bug_2654_Regression/run_test.pl @@ -49,7 +49,7 @@ if ($client != 0) { $status = 1; } -$server = $SV->WaitKill (10); +$server = $SV->WaitKill (15); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/tests/Bug_2734_Regression/run_test.pl b/TAO/tests/Bug_2734_Regression/run_test.pl index 144afe9318a..c0a65a695e2 100755 --- a/TAO/tests/Bug_2734_Regression/run_test.pl +++ b/TAO/tests/Bug_2734_Regression/run_test.pl @@ -42,7 +42,7 @@ if ($client != 0) { $status = 1; } -$server = $SV->WaitKill(5); +$server = $SV->WaitKill(15); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/tests/CallbackTest/run_test.pl b/TAO/tests/CallbackTest/run_test.pl index 205ae00ffa6..ee078f19b35 100755 --- a/TAO/tests/CallbackTest/run_test.pl +++ b/TAO/tests/CallbackTest/run_test.pl @@ -18,7 +18,7 @@ if (PerlACE::is_vxworks_test()) { else { $SV = new PerlACE::Process ("server", "-o $iorfile"); } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBDottedDecimalAddresses 1"); $SV->Spawn (); @@ -27,7 +27,7 @@ if (PerlACE::waitforfile_timed ($iorfile, print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client = $CL->SpawnWaitKill (60); diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl index 2684b1c47f8..2b2fde9c381 100755 --- a/TAO/tests/MT_BiDir/run_test.pl +++ b/TAO/tests/MT_BiDir/run_test.pl @@ -19,9 +19,9 @@ if (PerlACE::is_vxworks_test()) { else { $SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100"); } -$CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); -$CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); -$CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); +$CL1 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1"); +$CL2 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1"); +$CL3 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1"); $SV->Spawn (); diff --git a/TAO/tests/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl index 7e5114ed218..ef81dc186c7 100755 --- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl +++ b/TAO/tests/Muxed_GIOP_Versions/run_test.pl @@ -39,7 +39,12 @@ $serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile " . "-i $serveriterations -n $serverthreads -c $selfabusethreads " . "-l $corbaloc_str"; -$SV = new PerlACE::Process ("server", $serverargs); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", $serverargs); +} +else { + $SV = new PerlACE::Process ("server", $serverargs); +} $clientargs = "-ORBdebuglevel 10 -ORBLogFile $logfile -l $corbaloc_str -k file://$iorfile -n $clientthreads -i $clientiterations"; diff --git a/TAO/tests/POA/EndpointPolicy/run_test.pl b/TAO/tests/POA/EndpointPolicy/run_test.pl index 66ef426c740..292ca488d3f 100755 --- a/TAO/tests/POA/EndpointPolicy/run_test.pl +++ b/TAO/tests/POA/EndpointPolicy/run_test.pl @@ -41,7 +41,7 @@ $sharedSV->Spawn (); if (PerlACE::waitforfile_timed ($goodiorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$goodiorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); + $sharedSV->Kill (); $sharedSV->TimedWait (1); exit 1; } @@ -59,7 +59,7 @@ if ($client != 0) { $status = 1; } -$server = $sharedSV->WaitKill (10); +$server = $sharedSV->WaitKill (15); if ($server != 0) { print STDERR "ERROR: server [single profile per IOR] returned $server\n"; diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl index 6cc94538d96..83fe4b75f0f 100755 --- a/TAO/tests/Smart_Proxies/run_test.pl +++ b/TAO/tests/Smart_Proxies/run_test.pl @@ -9,12 +9,13 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); +$baseior = "test.ior"; +$iorfile = PerlACE::LocalFile ("$baseior"); unlink $iorfile; if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); + $SV = new PerlACE::ProcessVX ("server", "-o $baseior"); } else { $SV = new PerlACE::Process ("server", "-o $iorfile"); diff --git a/TAO/tests/Stack_Recursion/run_test.pl b/TAO/tests/Stack_Recursion/run_test.pl index 48a82da0241..6df72fae80b 100755 --- a/TAO/tests/Stack_Recursion/run_test.pl +++ b/TAO/tests/Stack_Recursion/run_test.pl @@ -39,7 +39,7 @@ if ($client != 0) { $status = 1; } -$server = $SV->TerminateWaitKill (5); +$server = $SV->TerminateWaitKill (15); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; |