summaryrefslogtreecommitdiff
path: root/TAO/tests/InterOp-Naming/run_test.pl
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/InterOp-Naming/run_test.pl')
-rwxr-xr-xTAO/tests/InterOp-Naming/run_test.pl186
1 files changed, 101 insertions, 85 deletions
diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl
index c40891efdef..f364abf05be 100755
--- a/TAO/tests/InterOp-Naming/run_test.pl
+++ b/TAO/tests/InterOp-Naming/run_test.pl
@@ -5,67 +5,74 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
# $Id$
# -*- perl -*-
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
-$file = PerlACE::LocalFile ("test.ior");
-$port = PerlACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0
+$cwd = getcwd();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
+$port = ACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0
-$status = 0;
+ACE::checkForTarget($cwd);
print STDERR "\n\n==== InitRef test\n";
unlink $file;
-$SV = new PerlACE::Process ("INS_test_server",
- "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port "
- . " -i object_name -o $file -ORBDottedDecimalAddresses 1");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 5) == -1) {
- print STDERR "ERROR: cannot find file <$file>\n";
- $SV->Kill ();
- exit 1;
+$SV = Process::Create ($EXEPREFIX."INS_test_server".$EXE_EXT,
+ "-ORBEndpoint iiop://$TARGETHOSTNAME:$port "
+ . " -i object_name -o $file");
+
+if (ACE::waitforfile_timed ($file, 5) == -1) {
+ print STDERR "ERROR: cannot find file <$file>\n";
+ $SV->Kill (); $SV->TimedWait (1);
+ exit 1;
}
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
" random_service "
."-ORBInitRef random_service="
- ."corbaloc::1.1@"."$TARGETHOSTNAME:$port/object_name");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+ ."corbaloc:iiop:$TARGETHOSTNAME:$port/object_name");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
print STDERR "\n\n==== InvalidName test\n";
-$CL = new PerlACE::Process ("INS_test_client",
- " not_a_service "
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
+ " not_a_service "
."-ORBInitRef random_service="
- ."corbaloc:iiop:1.0@"."$TARGETHOSTNAME:$port/object_name");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+ ."corbaloc:iiop:$TARGETHOSTNAME:$port/object_name");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
print STDERR "\n\n==== DefaultInitRef test\n";
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
" object_name "
. "-ORBDefaultInitRef"
- ." corbaloc:iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+ ." corbaloc:iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
print STDERR "\n\n==== Multi endpoint test\n";
@@ -73,83 +80,92 @@ print STDERR "\n\n==== Multi endpoint test\n";
$port1 = $port + 1;
$port2 = $port + 2;
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
" random_service "
. "-ORBInitRef random_service="
."corbaloc:"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port1,"
- .":1.0@"."$TARGETHOSTNAME:$port2,"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port"
+ ."iiop:$TARGETHOSTNAME:$port1,"
+ ."iiop:$TARGETHOSTNAME:$port2,"
+ ."iiop:$TARGETHOSTNAME:$port"
."/object_name");
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
-print STDERR "\n\n==== Multi endpoint test with CORBA::ORB::list_initial_services ()\n";
+print STDERR "\n\n==== Multi endpoint test with "
+ . "CORBA::ORB::list_initial_services ()\n";
$port1 = $port + 1;
$port2 = $port + 2;
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
" random_service "
. " -l "
. "-ORBInitRef random_service="
. "corbaloc:"
- . "iiop:1.0@"."$TARGETHOSTNAME:$port1,"
- . "iiop:1.0@"."$TARGETHOSTNAME:$port2,"
- . "iiop:1.0@"."$TARGETHOSTNAME:$port"
+ . "iiop:$TARGETHOSTNAME:$port1,"
+ . "iiop:$TARGETHOSTNAME:$port2,"
+ . "iiop:$TARGETHOSTNAME:$port"
. "/object_name");
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
print STDERR "\n\n==== Multi endpoint default ref test\n";
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
" object_name "
. "-ORBDefaultInitRef "
."corbaloc:"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port1,"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port2,"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+ ."iiop:$TARGETHOSTNAME:$port1,"
+ ."iiop:$TARGETHOSTNAME:$port2,"
+ ."iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
print STDERR "\n\n==== Default ref with final '/'\n";
-$CL = new PerlACE::Process ("INS_test_client",
- " object_name "
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
+ " object_name "
. "-ORBDefaultInitRef "
."corbaloc:"
- ."iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
- print STDERR "ERROR: client returned $client\n";
- $status = 1;
+ ."iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+ print STDERR "ERROR: client timedout\n";
+ $CL->Kill (); $CL->TimedWait (1);
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
- print STDERR "ERROR: server returned $server\n";
- $status = 1;
+$SV->Terminate (); $server = $SV->TimedWait (5);
+if ($server == -1) {
+ print STDERR "ERROR: server timedout\n";
+ $SV->Kill (); $SV->TimedWait (1);
+ unlink $file;
+ exit 1;
}
unlink $file;
-
-exit $status;
+exit 0;
View Lorry Controller Status