Wed Sep 11 07:50:52 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * bin/tao_orb_tests.lst:
        * tao/RTCORBA/RT_ORB.cpp:
        * tests/Bug_3000_Regression/run_test.pl:
        * tests/Bug_3630_Regression/run_test.pl:
        * tests/Bug_3837_Regression/run_test.pl:
        * tests/CodeSets/simple/run_test.pl:
        * tests/OctetSeq/run_test.pl:
        * tests/OctetSeq/run_test1.pl:
        * tests/OctetSeq/run_test2.pl:
        * tests/TransportCurrent/Framework/run_test.pl:
        * tests/TransportCurrent/IIOP/run_test.pl:
          Improvements for the Android port

          commit f723a63d4ce65bcb102dbbf9a525467b01b7a14b
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 20:41:48 2013 +0200

                    IDL_Test doesn't run on Android
                  * TAO/bin/tao_orb_tests.lst:

          commit 777c5eeaab1045f07eb30bbd074bba83792b1344
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 20:41:01 2013 +0200

                    Copy conf files to target
                  * TAO/tests/TransportCurrent/Framework/run_test.pl:
                  * TAO/tests/TransportCurrent/IIOP/run_test.pl:

          commit 29b35e6080087514395a9a800693052ab728f0f2
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 15:36:42 2013 +0200

                    Disabled some tests for Android, can't run tao_idl
on the device
                  * TAO/bin/tao_orb_tests.lst:

          commit 12d94d292feccc61bcfc1472eb10ab64bb9dcdd3
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 15:31:40 2013 +0200

                    Copy svc conf files to target
                  * TAO/tests/Bug_3837_Regression/run_test.pl:
                  * TAO/tests/CodeSets/simple/run_test.pl:

          commit 6773f79cfaeac77d7e279d86b76c98eee6194531
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 15:18:36 2013 +0200

                    Copy svc conf files to target
                  * TAO/tao/RTCORBA/RT_ORB.cpp:
                  * TAO/tests/Bug_3000_Regression/run_test.pl:
                  * TAO/tests/Bug_3630_Regression/run_test.pl:
                  * TAO/tests/OctetSeq/run_test.pl:
                  * TAO/tests/OctetSeq/run_test1.pl:
                  * TAO/tests/OctetSeq/run_test2.pl:

3 files changed, 37 insertions, 9 deletions

diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index dd58f82249e..6f324c654bc 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -24,7 +24,6 @@ foreach $i (@ARGV) {
     }
 }
 
-
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 my $t3 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl
index 12a000cc8d3..d38aba7b675 100755
--- a/TAO/tests/OctetSeq/run_test1.pl
+++ b/TAO/tests/OctetSeq/run_test1.pl
@@ -11,8 +11,6 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 
-
-
 $client_iterations = '5000';
 
 $octet_iterations = '32';
@@ -36,9 +34,25 @@ my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 my $client_iorfile = $t3->LocalFile ($iorbase);
 
-my $server_conf = $server->LocalFile ("svc1" . $PerlACE::svcconf_ext);
-my $client_conf = $client->LocalFile ("svc1" . $PerlACE::svcconf_ext);
-my $t3_conf = $t3->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $conf_base = "svc1" . $PerlACE::svcconf_ext;
+my $server_conf = $server->LocalFile ($conf_base);
+my $client_conf = $client->LocalFile ($conf_base);
+my $t3_conf = $t3->LocalFile ($conf_base);
+
+if ($server->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$server_conf>\n";
+    exit 1;
+}
+
+if ($client->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
+
+if ($t3->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$t3_conf>\n";
+    exit 1;
+}
 
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl
index b726ba06460..d38aba7b675 100755
--- a/TAO/tests/OctetSeq/run_test2.pl
+++ b/TAO/tests/OctetSeq/run_test2.pl
@@ -34,10 +34,25 @@ my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 my $client_iorfile = $t3->LocalFile ($iorbase);
 
-my $server_conf = $server->LocalFile ("svc1" . $PerlACE::svcconf_ext);
-my $client_conf = $client->LocalFile ("svc1" . $PerlACE::svcconf_ext);
-my $t3_conf = $t3->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $conf_base = "svc1" . $PerlACE::svcconf_ext;
+my $server_conf = $server->LocalFile ($conf_base);
+my $client_conf = $client->LocalFile ($conf_base);
+my $t3_conf = $t3->LocalFile ($conf_base);
 
+if ($server->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$server_conf>\n";
+    exit 1;
+}
+
+if ($client->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
+
+if ($t3->PutFile ($conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$t3_conf>\n";
+    exit 1;
+}
 
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);