Wed Jun 18 13:04:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 16 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1161ce44792..49105f2a2c1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 18 13:04:00 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/CallbackTest/run_test.pl:
+          DottedDecimalAddresses is not required for this test. Don't duplicate
+          ior filename
+
 Wed Jun 18 12:40:00 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tao/Compression.mpc:
diff --git a/TAO/tests/CallbackTest/run_test.pl b/TAO/tests/CallbackTest/run_test.pl
index 09f6aee08f6..df7d1591296 100755
--- a/TAO/tests/CallbackTest/run_test.pl
+++ b/TAO/tests/CallbackTest/run_test.pl
@@ -13,21 +13,26 @@ my $target = PerlACE::TestTarget::create_target ("server");
 my $host = PerlACE::TestTarget::create_target ("client");
 
 $iorbase = "server.ior";
-$server_iorfile = $target->LocalFile ("server.ior");
-$client_iorfile = $host->LocalFile ("server.ior");
+$server_iorfile = $target->LocalFile ("$iorbase");
+$client_iorfile = $host->LocalFile ("$iorbase");
 $target->DeleteFile ($server_iorfile);
 $host->DeleteFile ($client_iorfile);
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
 }
 else {
     $SV = $target->CreateProcess ("server", "-o $server_iorfile");
 }
-$CL = $host->CreateProcess ("client", "-k file://$client_iorfile -ORBDottedDecimalAddresses 1");
+$CL = $host->CreateProcess ("client", "-k file://$client_iorfile");
 
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
 
 if ($target->WaitForFileTimed ($server_iorfile,
                                $target->ProcessStartWaitInterval()) == -1) {