ChangeLogTag: Wed Feb 20 11:00:00 UTC 2008 Simon Massey <sma at prismtech dot com>

2 files changed, 21 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 11b3eaa7db5..59972109ff5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 20 11:00:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * tests/CodeSets/simple/run_test.pl:
+          Add the necessary library paths for the libs/IBM1047_ISO8859
+          and libs/UCS4_UTF16.
+
 Tue Feb 19 22:20:05 UTC 2008  Ciju John  <johnc at ociweb dot com>
 
         * tests/Timed_Buffered_Oneways/client.cpp:
diff --git a/TAO/tests/CodeSets/simple/run_test.pl b/TAO/tests/CodeSets/simple/run_test.pl
index 996cb65a029..7e4c20defbb 100755
--- a/TAO/tests/CodeSets/simple/run_test.pl
+++ b/TAO/tests/CodeSets/simple/run_test.pl
@@ -8,6 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::add_lib_path ('../lib/IBM1047_ISO8859/.');
+PerlACE::add_lib_path ('../lib/UCS4_UTF16/.');
+
 $iorfile = PerlACE::LocalFile ("server.ior");
 unlink $iorfile;
 $status = 0;
@@ -19,24 +22,25 @@ my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
 $SV = new $class ("server", " -ORBDottedDecimalAddresses 1");
 $CL = new PerlACE::Process ("client", " -ORBSvcConf cs_test.conf");
 
-$SV->Spawn ();
-
+$server = $SV->Spawn ();
+if ($server != 0) {
+    print STDERR "ERROR: Starting server returned $server\n";
+    exit 1;
+}
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
+    $SV->Kill ();
     exit 1;
 } 
 
 $client = $CL->SpawnWaitKill (60);
-
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
 }
 
 $server = $SV->WaitKill (15);
-
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
@@ -49,24 +53,25 @@ print STDOUT "\nServer using char translator\n\n";
 $SV2 = new $class ("server", " -ORBDottedDecimalAddresses 1 -ORBSvcConf cs_test.conf");
 $CL2 = new PerlACE::Process ("client");
 
-$SV2->Spawn ();
-
+$server = $SV2->Spawn ();
+if ($server != 0) {
+    print STDERR "ERROR: Starting server returned $server\n";
+    exit 1;
+}
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV2->Kill (); $SV2->TimedWait (1);
+    $SV2->Kill ();
     exit 1;
 } 
 
 $client2 = $CL2->SpawnWaitKill (60);
-
 if ($client2 != 0) {
     print STDERR "ERROR: client returned $client2\n";
     $status = 1;
 }
 
 $server2 = $SV2->WaitKill (15);
-
 if ($server2 != 0) {
     print STDERR "ERROR: server returned $server2\n";
     $status = 1;