diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-13 14:45:48 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-13 14:45:48 +0000 |
commit | 70ea04d970eaf67417a2543fe6c31ae4331cd99a (patch) | |
tree | b06dd9e5ff3434626c90d3b8ac6054ef5d004579 | |
parent | 9f596f3f521e626a194547f208f4e0804bd42531 (diff) | |
download | ATCD-70ea04d970eaf67417a2543fe6c31ae4331cd99a.tar.gz |
Thu Nov 13 14:45:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/ChangeLog | 21 | ||||
-rwxr-xr-x | TAO/tests/Bug_1636_Regression/run_test.pl | 19 | ||||
-rwxr-xr-x | TAO/tests/Bug_1670_Regression/run_test.pl | 66 | ||||
-rwxr-xr-x | TAO/tests/Bug_1676_Regression/run_test.pl | 69 | ||||
-rwxr-xr-x | TAO/tests/Bug_2134_Regression/run_test.pl | 25 | ||||
-rwxr-xr-x | TAO/tests/Bug_2188_Regression/run_test.pl | 65 | ||||
-rwxr-xr-x | TAO/tests/Bug_2328_Regression/run_test.pl | 68 | ||||
-rw-r--r-- | TAO/tests/Bug_2349_Regression/client.cpp | 32 | ||||
-rwxr-xr-x | TAO/tests/Bug_2349_Regression/run_test.pl | 69 | ||||
-rw-r--r-- | TAO/tests/Bug_2349_Regression/server.cpp | 34 | ||||
-rwxr-xr-x | TAO/tests/Bug_2356_Regression/run_test.pl | 75 | ||||
-rw-r--r-- | TAO/tests/Bug_2417_Regression/client.cpp | 35 | ||||
-rwxr-xr-x | TAO/tests/Bug_2417_Regression/run_test.pl | 74 | ||||
-rw-r--r-- | TAO/tests/Bug_2417_Regression/server.cpp | 39 | ||||
-rwxr-xr-x | TAO/tests/Bug_2429_Regression/run_test.pl | 90 | ||||
-rwxr-xr-x | TAO/tests/Bug_2503_Regression/run_test.pl | 68 |
16 files changed, 599 insertions, 250 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 37eecff6d72..1e9316240b7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,24 @@ +Thu Nov 13 14:45:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_1636_Regression/run_test.pl: + * tests/Bug_1670_Regression/run_test.pl: + * tests/Bug_1676_Regression/run_test.pl: + * tests/Bug_2134_Regression/run_test.pl: + * tests/Bug_2188_Regression/run_test.pl: + * tests/Bug_2328_Regression/run_test.pl: + * tests/Bug_2349_Regression/run_test.pl: + * tests/Bug_2356_Regression/run_test.pl: + * tests/Bug_2417_Regression/run_test.pl: + * tests/Bug_2429_Regression/run_test.pl: + * tests/Bug_2503_Regression/run_test.pl: + Converted to the new test framework + + * tests/Bug_2417_Regression/server.cpp: + * tests/Bug_2349_Regression/client.cpp: + * tests/Bug_2349_Regression/server.cpp: + * tests/Bug_2417_Regression/client.cpp: + Added support to pass ior filename from the commandline + Thu Nov 13 10:49:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc: diff --git a/TAO/tests/Bug_1636_Regression/run_test.pl b/TAO/tests/Bug_1636_Regression/run_test.pl index b1f66ba55ce..2e0c5610736 100755 --- a/TAO/tests/Bug_1636_Regression/run_test.pl +++ b/TAO/tests/Bug_1636_Regression/run_test.pl @@ -5,21 +5,18 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -# This is a Perl script that runs the federated Name Service timeout test. -# It starts all the servers and clients as necessary. - use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; -use PerlACE::Run_Test; - -$status = 0; +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$CLIENT = new PerlACE::Process ("client"); +$SV = $server->CreateProcess ("client"); -$client = $CLIENT->SpawnWaitKill (30); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($client !=0 ) { - print STDERR "ERROR: client returned $client\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/Bug_1670_Regression/run_test.pl b/TAO/tests/Bug_1670_Regression/run_test.pl index 90ae124d1c8..1c5a7d5efcf 100755 --- a/TAO/tests/Bug_1670_Regression/run_test.pl +++ b/TAO/tests/Bug_1670_Regression/run_test.pl @@ -6,43 +6,71 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; $status = 0; +$debug_level = '0'; -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -else { - $SV = new PerlACE::Process ("server", "-o $iorfile"); + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); -$SV->Spawn (); +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (300); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->TerminateWaitKill (10); +$server_status = $SV->TerminateWaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_1676_Regression/run_test.pl b/TAO/tests/Bug_1676_Regression/run_test.pl index fee5bc7bc29..08ce72b2631 100755 --- a/TAO/tests/Bug_1676_Regression/run_test.pl +++ b/TAO/tests/Bug_1676_Regression/run_test.pl @@ -6,44 +6,71 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; +$debug_level = '0'; -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -else { - $SV = new PerlACE::Process ("server", "-o $iorfile"); + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); - -$SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} -$client = $CL->SpawnWaitKill (300); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (10); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_2134_Regression/run_test.pl b/TAO/tests/Bug_2134_Regression/run_test.pl index 20363316932..887e2b1608a 100755 --- a/TAO/tests/Bug_2134_Regression/run_test.pl +++ b/TAO/tests/Bug_2134_Regression/run_test.pl @@ -1,27 +1,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; -$status = 0; +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -if (PerlACE::is_vxworks_test()) { -$CL = new PerlACE::ProcessVX ("server", "-ORBObjRefStyle URL"); -} -else { -$CL = new PerlACE::Process ("server", "-ORBObjRefStyle URL"); -} +$SV = $server->CreateProcess ("server", "-ORBObjRefStyle URL"); -$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/Bug_2188_Regression/run_test.pl b/TAO/tests/Bug_2188_Regression/run_test.pl index d4110fcaef3..08ce72b2631 100755 --- a/TAO/tests/Bug_2188_Regression/run_test.pl +++ b/TAO/tests/Bug_2188_Regression/run_test.pl @@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; $debug_level = '0'; @@ -14,48 +14,63 @@ $debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; - } + } } -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-ORBDebuglevel $debug_level -o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -o $iorfile"); +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); - -$server = $SV->Spawn (); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); exit 1; } -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -$client = $CL->SpawnWaitKill (300); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (10); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_2328_Regression/run_test.pl b/TAO/tests/Bug_2328_Regression/run_test.pl index 3a03a5bac3c..622873bd249 100755 --- a/TAO/tests/Bug_2328_Regression/run_test.pl +++ b/TAO/tests/Bug_2328_Regression/run_test.pl @@ -6,45 +6,71 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; +$debug_level = '0'; -$iorfilebase = "server.ior"; -$iorfile = PerlACE::LocalFile ("$iorfilebase"); -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -else { - $SV = new PerlACE::Process ("server", "-o $iorfile"); + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile -ORBNegotiateCodesets 0"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBNegotiateCodesets 0"); -$SV->Spawn (); +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (300); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (15); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_2349_Regression/client.cpp b/TAO/tests/Bug_2349_Regression/client.cpp index 5d1487de278..a0b17710535 100644 --- a/TAO/tests/Bug_2349_Regression/client.cpp +++ b/TAO/tests/Bug_2349_Regression/client.cpp @@ -2,8 +2,35 @@ #include "fooC.h" #include "ace/Log_Msg.h" +#include "ace/Get_Opt.h" -const char* ior = "file://server.ior"; +const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -12,6 +39,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + return 1; + CORBA::Object_var tmp = orb->string_to_object(ior); foo_var server = foo::_narrow(tmp.in ()); diff --git a/TAO/tests/Bug_2349_Regression/run_test.pl b/TAO/tests/Bug_2349_Regression/run_test.pl index 23cb6eebf21..08ce72b2631 100755 --- a/TAO/tests/Bug_2349_Regression/run_test.pl +++ b/TAO/tests/Bug_2349_Regression/run_test.pl @@ -6,44 +6,71 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; +$debug_level = '0'; -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server"); +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -else { - $SV = new PerlACE::Process ("server"); + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; } -$CL = new PerlACE::Process ("client"); - -$SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} -$client = $CL->SpawnWaitKill (10); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (15); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index b19cb0b27c3..55cf12daf2d 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -2,8 +2,35 @@ #include "fooS.h" #include "ace/OS_NS_stdio.h" +#include "ace/Get_Opt.h" -const char* ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} class foo_i: public POA_foo { @@ -60,6 +87,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + return 1; + CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); @@ -96,7 +126,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_output_file), - 1); + 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/Bug_2356_Regression/run_test.pl b/TAO/tests/Bug_2356_Regression/run_test.pl index db18ea9f9fa..b6027129f11 100755 --- a/TAO/tests/Bug_2356_Regression/run_test.pl +++ b/TAO/tests/Bug_2356_Regression/run_test.pl @@ -1,55 +1,76 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; -$client_conf = PerlACE::LocalFile ("muxed$PerlACE::svcconf_ext"); - $debug_level = '0'; -$iorfile = PerlACE::LocalFile ("server.ior"); - -unlink $iorfile; -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-ORBdebuglevel $debug_level -o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -o $iorfile"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$SV->Spawn (); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile -d"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$CL = new PerlACE::Process ("client", - "-ORBdebuglevel $debug_level" - . " -k file://$iorfile " - . " -d"); +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -$client = $CL->SpawnWaitKill (60); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (15); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index e47d276294f..c937030ef47 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -5,6 +5,35 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +const ACE_TCHAR *ior = ACE_TEXT ("file://ior.out"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + + class ThreadPool : public ACE_Task_Base { public: @@ -20,6 +49,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) @@ -40,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Subscriber_var subscriber_var = Subscriber::_narrow (object.in ()); - object = orb->string_to_object("file://ior.out"); + object = orb->string_to_object(ior); Publisher_var publisher = Publisher::_narrow(object.in()); publisher->subscribe(subscriber_var.in()); diff --git a/TAO/tests/Bug_2417_Regression/run_test.pl b/TAO/tests/Bug_2417_Regression/run_test.pl index d3ef72b225d..0291ad09e42 100755 --- a/TAO/tests/Bug_2417_Regression/run_test.pl +++ b/TAO/tests/Bug_2417_Regression/run_test.pl @@ -1,54 +1,76 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; -$iorfile = PerlACE::LocalFile ("ior.out"); -unlink $iorfile; $status = 0; +$debug_level = '0'; -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", ""); -} -else { - $SV = new PerlACE::Process ("server", ""); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CL1 = new PerlACE::Process ("client", ""); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "ior.out"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); -$server = $SV->Spawn (); +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; exit 1; } -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$CL1->Spawn (); +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -$client = $CL1->WaitKill (60); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (35); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; -exit $status +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); + +exit $status; diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 5755866e4d4..eab72252371 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -6,6 +6,34 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior.out"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + class ThreadPool : public ACE_Task_Base { public: @@ -21,6 +49,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) @@ -43,11 +75,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%C>\n", ior.in())); // output the ior - FILE *output_file= ACE_OS::fopen ("ior.out", "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: ior.out"), - 1); + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/Bug_2429_Regression/run_test.pl b/TAO/tests/Bug_2429_Regression/run_test.pl index 55917686742..8428807d7e0 100755 --- a/TAO/tests/Bug_2429_Regression/run_test.pl +++ b/TAO/tests/Bug_2429_Regression/run_test.pl @@ -2,53 +2,75 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -#$Id$ - +# $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; -# The server IOR file -$plain_server_ior_file = "server.ior"; -$server_ior_file = PerlACE::LocalFile ($plain_server_ior_file); -unlink $server_ior_file; +$status = 0; +$debug_level = '0'; -# The client and server processes -if (PerlACE::is_vxworks_test()) { - $SERVER = new PerlACE::ProcessVX ("server", "-o $plain_server_ior_file"); -} -else { - $SERVER = new PerlACE::Process ("server", "-o $server_ior_file"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CLIENT = new PerlACE::Process(PerlACE::LocalFile("client")); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -# Fire up the server -$server = $SERVER->Spawn(); +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-f file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; exit 1; } -# We can wait on the IOR file -if (PerlACE::waitforfile_timed ($server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1) -{ - print STDERR "ERROR: cannot find $server_ior_file\n"; - $SERVER->Kill(); - exit 1; +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; } -$CLIENT->Arguments("-f file://$server_ior_file"); -if ($CLIENT->SpawnWaitKill (15) != 0) -{ - print STDERR "ERROR: Regression - Non zero result from client or client timed out.\n"; - $SERVER->Kill(); - exit 1; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; } -# Clean up and return -$SERVER->TerminateWaitKill (5); -unlink $server_ior_file; -exit 0; +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); + +exit $status; diff --git a/TAO/tests/Bug_2503_Regression/run_test.pl b/TAO/tests/Bug_2503_Regression/run_test.pl index 549c410eb41..08ce72b2631 100755 --- a/TAO/tests/Bug_2503_Regression/run_test.pl +++ b/TAO/tests/Bug_2503_Regression/run_test.pl @@ -6,49 +6,71 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; +$debug_level = '0'; -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", "-o $iorfile"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); -$server = $SV->Spawn (); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); exit 1; } -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (300); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (20); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->GetStderrLog(); +$client->GetStderrLog(); + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); exit $status; |