Thu Sep 5 07:55:57 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/Bug_2174_Regression/run_test.pl:
        * tests/Bug_3000_Regression/run_test.pl:
        * tests/Bug_3531_Regression/run_test.pl:
        * tests/Bug_3853_Regression/run_test.pl:
        * tests/Bug_4010_Regression/run_test.pl:
        * tests/Exposed_Policies/run_test.pl:
        * tests/HandleExhaustion/run_test.pl:
        * tests/Hang_Shutdown/run_test.pl:
        * tests/Muxed_GIOP_Versions/run_test.pl:
        * tests/OBV/TC_Alignment/run_test.pl:
        * tests/Optimized_Connection/run_test.pl:
        * tests/Server_Connection_Purging/run_test.pl:
        * tests/TransportCurrent/Framework/run_test.pl:
        * tests/TransportCurrent/IIOP/run_test.pl:
          Fixes for the Android port

          commit f90a0bf55e83d6565d0641ea0ba2fe2209f5305a
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Fri Aug 23 15:41:29 2013 +0200

                    Copy conf files to target
                  * TAO/tests/Exposed_Policies/run_test.pl:

          commit 25b050b9725f79351a75f48cdf978ae236702a70
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Fri Aug 23 15:35:23 2013 +0200

                    Also with the second spawn of the server pass the
filename
                    it should use for the IOR
                  * TAO/tests/Hang_Shutdown/run_test.pl:

          commit 6f0b01d790c1628e81e67c93c4db9f6f3ac37d71
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Fri Aug 23 15:14:44 2013 +0200

                    Removed printing of CommandLine, test framework
                    can do that at a lower level and this method
                    isn't supported on Android currently
                  * TAO/tests/Bug_3000_Regression/run_test.pl:
                  * TAO/tests/Bug_3531_Regression/run_test.pl:
                  * TAO/tests/Bug_3853_Regression/run_test.pl:
                  * TAO/tests/Bug_4010_Regression/run_test.pl:
                  * TAO/tests/Muxed_GIOP_Versions/run_test.pl:
                  * TAO/tests/OBV/TC_Alignment/run_test.pl:
                  * TAO/tests/Server_Connection_Purging/run_test.pl:
                  * TAO/tests/TransportCurrent/Framework/run_test.pl:
                  * TAO/tests/TransportCurrent/IIOP/run_test.pl:

          commit d5ebcd70308dbb06f97b98764038e2fdb13899e0
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Fri Aug 23 15:13:08 2013 +0200

                    Improved these scripts so that they will
                    better behave on Android
                  * TAO/tests/Bug_2174_Regression/run_test.pl:
                  * TAO/tests/HandleExhaustion/run_test.pl:
                  * TAO/tests/Optimized_Connection/run_test.pl:

14 files changed, 25 insertions, 29 deletions

diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index 753633508ce..7e7151718dd 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -58,7 +58,7 @@ if ($client->PutFile ($iorbase) == -1) {
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
 
 if ($client_status != 2) {
-    print STDERR "ERROR: client returned $client_status\n";
+    print STDERR "ERROR: client returned $client_status, should return 2\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 }
diff --git a/TAO/tests/Bug_3000_Regression/run_test.pl b/TAO/tests/Bug_3000_Regression/run_test.pl
index 290a652f090..b5630b00857 100755
--- a/TAO/tests/Bug_3000_Regression/run_test.pl
+++ b/TAO/tests/Bug_3000_Regression/run_test.pl
@@ -57,8 +57,6 @@ $CL2 = $client2->CreateProcess ("client",
                                 "-ORBDottedDecimalAddresses 2 " .
                                 "-ORBEndpoint iiop://:$port2");
 
-print $SV->CommandLine() . "\n";
-
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
@@ -91,8 +89,6 @@ if ($client2->PutFile ($iorfile) == -1) {
     exit 1;
 }
 
-print $CL1->CommandLine() . "\n";
-
 $client_status = $CL1->SpawnWaitKill ($client1->ProcessStartWaitInterval() + 45);
 
 # The client crashes, therefore it normally exists with status != 0,
@@ -102,8 +98,6 @@ if ($client_status == -1) {
     $status = 1;
 }
 
-print $CL2->CommandLine() . "\n";
-
 $client_status = $CL2->SpawnWaitKill ($client2->ProcessStartWaitInterval() + 45);
 
 # The client crashes, therefore it normally exists with status != 0,
diff --git a/TAO/tests/Bug_3531_Regression/run_test.pl b/TAO/tests/Bug_3531_Regression/run_test.pl
index 4abf90d2143..5077732610b 100755
--- a/TAO/tests/Bug_3531_Regression/run_test.pl
+++ b/TAO/tests/Bug_3531_Regression/run_test.pl
@@ -56,7 +56,6 @@ $CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client",
                                     "-k file://$clients_iorfile[$num_clients - 1] -x");
 
 # start server and wait for file
-print STDERR $SV->CommandLine(), "\n" if $verbose;
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
@@ -93,7 +92,6 @@ if ($status != 0) {
 # spawn clients in the loop and one in separated way
 my $broken_number = 0;
 for($i = 0; $i < $num_clients - 1; $i++) {
-    print STDERR $CLS[$i]->CommandLine(), "\n" if $verbose;
     my $client_status = $CLS[$i]->Spawn();
     if ($client_status != 0) {
         print STDERR "ERROR: client $i Spawn returned $client_status\n";
diff --git a/TAO/tests/Bug_3853_Regression/run_test.pl b/TAO/tests/Bug_3853_Regression/run_test.pl
index 332df733501..42e5279cb38 100755
--- a/TAO/tests/Bug_3853_Regression/run_test.pl
+++ b/TAO/tests/Bug_3853_Regression/run_test.pl
@@ -35,10 +35,6 @@ $SV1 = $server1->CreateProcess ("server", "-ORBEndpoint iiop://localhost:$port1
 $SV2 = $server2->CreateProcess ("server", "-ORBEndpoint iiop://localhost:$port2 -o $server_iorfile2 -s $shutdown_server_iorfile2");
 $CL = $client->CreateProcess ("client", "-t 30");
 
-print STDERR $SV1->CommandLine() . "\n";
-print STDERR $SV2->CommandLine() . "\n";
-print STDERR $CL->CommandLine() . "\n";
-
 $server_status = $SV1->Spawn ();
 
 if ($server_status != 0) {
diff --git a/TAO/tests/Bug_4010_Regression/run_test.pl b/TAO/tests/Bug_4010_Regression/run_test.pl
index abf96482d9a..b9782406e87 100755
--- a/TAO/tests/Bug_4010_Regression/run_test.pl
+++ b/TAO/tests/Bug_4010_Regression/run_test.pl
@@ -46,9 +46,6 @@ $SV1 = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server
 $SV2 = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile -ORBListenEndpoints iiop://:${port}");
 $CL = $client->CreateProcess ("client", "-ORBdebuglevel $cdebug_level -ORBSvcConf $client_conf -k file://$client_iorfile -t $loop_time -i $iterations");
 
-print $SV1->CommandLine() . "\n\n";
-print $CL->CommandLine() . "\n\n";
-
 $server_status = $SV1->Spawn ();
 
 if ($server_status != 0) {
diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl
index e1b9cae5e4c..216e550c8bb 100755
--- a/TAO/tests/Exposed_Policies/run_test.pl
+++ b/TAO/tests/Exposed_Policies/run_test.pl
@@ -41,6 +41,15 @@ my $server_cfg_object = $server->LocalFile ($cfg_object);
 my $client_cfg_poa = $client->LocalFile ($cfg_poa);
 my $client_cfg_object = $client->LocalFile ($cfg_object);
 
+if ($server->PutFile ($cfg_poa) == -1) {
+    print STDERR "ERROR: cannot set file <$server_cfg_poa>\n";
+    return 1;
+}
+if ($server->PutFile ($cfg_object) == -1) {
+    print STDERR "ERROR: cannot set file <$server_cfg_object>\n";
+    return 1;
+}
+
 if ($^O eq "dec_osf") {
     $server_cfg_poa = "$server_cfg_poa$cfg_suffix_tru64";
     $server_cfg_object = "$server_cfg_object$cfg_suffix_tru64";
diff --git a/TAO/tests/HandleExhaustion/run_test.pl b/TAO/tests/HandleExhaustion/run_test.pl
index 3d2dc31b097..81734769a47 100755
--- a/TAO/tests/HandleExhaustion/run_test.pl
+++ b/TAO/tests/HandleExhaustion/run_test.pl
@@ -31,7 +31,7 @@ my $logbase = 'server.log';
 my $server_logfile = $server->LocalFile ($logbase);
 $server->DeleteFile($logbase);
 
-my $SV = $server->CreateProcess ("server", "-ORBAcceptErrorDelay 5 -ORBDebugLevel 1 -ORBLogFile $logbase -o $server_iorfile");
+my $SV = $server->CreateProcess ("server", "-ORBAcceptErrorDelay 5 -ORBDebugLevel 1 -ORBLogFile $server_logfile -o $server_iorfile");
 my $CL = $client->CreateProcess ("client", "-k file://$client_iorfile");
 
 my $server_status = $SV->Spawn();
diff --git a/TAO/tests/Hang_Shutdown/run_test.pl b/TAO/tests/Hang_Shutdown/run_test.pl
index fc72acb06b6..94b09bc5045 100755
--- a/TAO/tests/Hang_Shutdown/run_test.pl
+++ b/TAO/tests/Hang_Shutdown/run_test.pl
@@ -58,7 +58,7 @@ if ($client->PutFile ($svcconf) == -1) {
     exit 1;
 }
 
-$SV2 = $server->CreateProcess ("server");
+$SV2 = $server->CreateProcess ("server", " -o $server_iorfile");
 $CL2 = $client->CreateProcess ("client", " -ORBSvcConf $client_svcfile");
 
 $SV2->Spawn ();
diff --git a/TAO/tests/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
index c6fa0aa8d35..53cdc38708e 100755
--- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl
+++ b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
@@ -119,7 +119,6 @@ if ($client3->PutFile ($iorbase) == -1) {
 print STDERR "****** Start the clients*** \n" if $verbose;
 
 if ($clients > 0) {
-    print STDERR $CL1->CommandLine(), "\n" if $verbose;
     $client_status = $CL1->Spawn ();
 
     if ($client_status != 0) {
diff --git a/TAO/tests/OBV/TC_Alignment/run_test.pl b/TAO/tests/OBV/TC_Alignment/run_test.pl
index 5b0909c98e5..b2a49b82c6f 100755
--- a/TAO/tests/OBV/TC_Alignment/run_test.pl
+++ b/TAO/tests/OBV/TC_Alignment/run_test.pl
@@ -46,8 +46,6 @@ if ($server->WaitForFileTimed ($iorbase,
     exit 1;
 }
 
-print STDERR $CL->CommandLine(), "\n";
-
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ());
 
 if ($client_status != 0) {
diff --git a/TAO/tests/Optimized_Connection/run_test.pl b/TAO/tests/Optimized_Connection/run_test.pl
index 79ad8241918..d3851056a5c 100755
--- a/TAO/tests/Optimized_Connection/run_test.pl
+++ b/TAO/tests/Optimized_Connection/run_test.pl
@@ -22,12 +22,23 @@ my $client = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 my $iorbase = "oc.ior";
 my $client_iorfile = $client->LocalFile ($iorbase);
 
-my $client_conf = $client->LocalFile ("oc_svc.conf");
+$client_conf_base = "oc_svc$PerlACE::svcconf_ext";
+my $client_conf = $client->LocalFile ($client_conf_base);
+if ($client->PutFile ($client_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
 
 $CL = $client->CreateProcess ("client", "-k file://$client_iorfile ".
                                         "-orbsvcconf $client_conf ".
                                         "-ORBDebugLevel $debug_level");
 
+my $client_status = $CL->Spawn();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    exit 1;
+}
 
 if ($client->WaitForFileTimed ($iorbase,
                            $client->ProcessStartWaitInterval()) == -1) {
@@ -35,7 +46,7 @@ if ($client->WaitForFileTimed ($iorbase,
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+$client_status = $CL->WaitKill ($client->ProcessStartWaitInterval());
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Server_Connection_Purging/run_test.pl b/TAO/tests/Server_Connection_Purging/run_test.pl
index 94bac439231..583eb10b3c9 100755
--- a/TAO/tests/Server_Connection_Purging/run_test.pl
+++ b/TAO/tests/Server_Connection_Purging/run_test.pl
@@ -43,8 +43,6 @@ $CL = $client->CreateProcess ("client",
 
 $SH_CL = $client_shutdown->CreateProcess ("shutdown_client", "-k file://$client_shutdown_iorfile");
 
-print STDERR $CL->CommandLine(), "\n" ;
-
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl
index edc5562fa72..0ce5b565289 100755
--- a/TAO/tests/TransportCurrent/Framework/run_test.pl
+++ b/TAO/tests/TransportCurrent/Framework/run_test.pl
@@ -42,7 +42,6 @@ my $confclient = $client->LocalFile ("client$confmod.conf");
 $SV = $server->CreateProcess ("server", "@ARGV -ORBSvcConf $confserver -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "@ARGV -n 1 -ORBSvcConf $confclient -k file://$client_iorfile");
 
-print STDERR $SV->CommandLine()."\n";
 $SV->Spawn ();
 
 if ($server->WaitForFileTimed ($iorbase,
@@ -52,7 +51,6 @@ if ($server->WaitForFileTimed ($iorbase,
     exit 1;
 }
 
-print STDERR $CL->CommandLine()."\n";
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ());
 
 if ($client_status != 0) {
diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl
index 5760c3cdd54..02ee4c6e1df 100755
--- a/TAO/tests/TransportCurrent/IIOP/run_test.pl
+++ b/TAO/tests/TransportCurrent/IIOP/run_test.pl
@@ -47,7 +47,6 @@ $SV = $server->CreateProcess ("server",
 $CL = $client->CreateProcess ("client",
                               "@ARGV -n 1 -ORBSvcConf $client_conf_file -k file://$client_iorfile");
 
-print STDERR $SV->CommandLine()."\n";
 $SV->Spawn ();
 
 if ($server->WaitForFileTimed ($iorbase,
@@ -57,7 +56,6 @@ if ($server->WaitForFileTimed ($iorbase,
     exit 1;
 }
 
-print STDERR $CL->CommandLine()."\n";
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ());
 
 if ($client_status != 0) {