summaryrefslogtreecommitdiff
path: root/TAO/tests/Hello
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-08-25 13:27:19 +0000
committerSteve Huston <shuston@riverace.com>2007-08-25 13:27:19 +0000
commit40881c9f984ac6fd0d3d6f980d6c1715ae9be1bb (patch)
treef64a8a8a6e29889070ba07b35804171e8391d5b5 /TAO/tests/Hello
parentca4633cf56d64e36c417f64e72b75897f5898d39 (diff)
downloadATCD-40881c9f984ac6fd0d3d6f980d6c1715ae9be1bb.tar.gz
ChangeLogTag:Sat Aug 25 12:37:53 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'TAO/tests/Hello')
-rwxr-xr-xTAO/tests/Hello/run_test.pl18
1 files changed, 12 insertions, 6 deletions
diff --git a/TAO/tests/Hello/run_test.pl b/TAO/tests/Hello/run_test.pl
index b2c4c956f2f..c7759f34735 100755
--- a/TAO/tests/Hello/run_test.pl
+++ b/TAO/tests/Hello/run_test.pl
@@ -7,6 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib "$ENV{ACE_ROOT}/bin";
use PerlACE::Run_Test;
+use PerlACE::TestTarget;
$status = 0;
$debug_level = '0';
@@ -17,17 +18,19 @@ foreach $i (@ARGV) {
}
}
+my $target = PerlACE::TestTarget::create_target ($PerlACE::TestConfig);
+
$iorbase = "server.ior";
-$iorfile = PerlACE::LocalFile ("$iorbase");
-unlink $iorfile;
+$iorfile = $target->LocalFile ("$iorbase");
+$target->DeleteFile($iorfile);
if (PerlACE::is_vxworks_test()) {
$SV = new PerlACE::ProcessVX ("server", "-ORBDebuglevel $debug_level -o $iorbase");
}
else {
- $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -o $iorfile");
+ $SV = $target->CreateProcess ("server", "-ORBdebuglevel $debug_level -ORBid hello_server -o $iorfile");
}
-$CL = new PerlACE::Process ("client", " -k file://$iorfile");
+$CL = $target->CreateProcess ("client", " -ORBid hello_client -k file://$iorfile");
$server = $SV->Spawn ();
@@ -36,7 +39,7 @@ if ($server != 0) {
exit 1;
}
-if (PerlACE::waitforfile_timed ($iorfile,
+if ($target->WaitForFileTimed ($iorfile,
$PerlACE::wait_interval_for_process_creation) == -1) {
print STDERR "ERROR: cannot find file <$iorfile>\n";
$SV->Kill (); $SV->TimedWait (1);
@@ -57,6 +60,9 @@ if ($server != 0) {
$status = 1;
}
-unlink $iorfile;
+$target->GetStderrLog();
+
+#unlink $iorfile;
+$target->DeleteFile($iorfile);
exit $status;