diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 11:26:30 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 11:26:30 +0000 |
commit | a43ad364663c8f3ca9c625cdf630dba43f9830b4 (patch) | |
tree | 47346db7cece88beccf46d9ee387c73e064b0ff3 /TAO/tests/Bug_2560_Regression | |
parent | b2463898b43aa4ec6f283cfe8ebd5252f94a8a9c (diff) | |
download | ATCD-a43ad364663c8f3ca9c625cdf630dba43f9830b4.tar.gz |
Mon Nov 17 11:25:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Bug_2560_Regression')
-rwxr-xr-x | TAO/tests/Bug_2560_Regression/run_test.pl | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/TAO/tests/Bug_2560_Regression/run_test.pl b/TAO/tests/Bug_2560_Regression/run_test.pl index 8404d7f98af..144c6ba6d58 100755 --- a/TAO/tests/Bug_2560_Regression/run_test.pl +++ b/TAO/tests/Bug_2560_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'; @@ -17,37 +17,46 @@ foreach $i (@ARGV) { } } -$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"); -} -$CL = new PerlACE::Process ("client", "file://$iorfile MSFT"); +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 MSFT"); +$server_status = $SV->Spawn (); -print STDERR "Starting server\n"; -$server = $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; } -print STDERR "Starting client\n"; -$client = $CL->Spawn (); +$client_status = $CL->Spawn ($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; } @@ -56,13 +65,17 @@ sleep (2); print STDERR "Killing client\n"; $CL->Kill (3); -$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; |