Fri Sep 16 07:55:50 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * tests/Faults/run_test.pl:
        * tests/Faults/run_test_pp.pl:
        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
        * tests/POA/EndpointPolicy/run_test_dh.pl:
          Copy only those configuration files that are needed by the targets.
          We don't want to solve this in the test framework; the script knows
          which configuration files should be copied.

5 files changed, 51 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7dfd2dd6ff2..9c440edc9e3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Sep 16 07:55:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Faults/run_test.pl:
+        * tests/Faults/run_test_pp.pl:
+        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+        * tests/POA/EndpointPolicy/run_test_dh.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
 Fri Sep 16 07:37:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * tests/Connect_Strategy_Test/run_test.pl:
diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl
index 393567ec1a6..d90e6dfd7e9 100755
--- a/TAO/tests/Faults/run_test.pl
+++ b/TAO/tests/Faults/run_test.pl
@@ -23,9 +23,7 @@ my $middle = PerlACE::TestTarget::create_target (3) || die "Create target 3 fail
 
 my $iorbase = "server.ior";
 my $midiorbase = "middle.ior";
-my $svcconf = "server$PerlACE::svcconf_ext";
 my $server_iorfile = $server->LocalFile ($iorbase);
-my $server_svcfile = $server->LocalFile ($svcconf);
 my $client_iorfile = $client->LocalFile ($iorbase);
 my $client_midiorfile = $client->LocalFile ($midiorbase);
 my $middle_iorfile = $middle->LocalFile ($iorbase);
@@ -36,6 +34,14 @@ $client->DeleteFile($midiorbase);
 $middle->DeleteFile($iorbase);
 $middle->DeleteFile($midiorbase);
 
+my $svcconf = "server$PerlACE::svcconf_ext";
+my $server_svcfile = $server->LocalFile ($svcconf);
+if ($server->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
+
 ###############################################################################
 print STDERR "################ Default ORB Config###############\n";
 print STDERR "===== Base test, no crashes\n";
diff --git a/TAO/tests/Faults/run_test_pp.pl b/TAO/tests/Faults/run_test_pp.pl
index 38a0f51a5b7..5e348fd00b7 100755
--- a/TAO/tests/Faults/run_test_pp.pl
+++ b/TAO/tests/Faults/run_test_pp.pl
@@ -21,13 +21,20 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
 my $iorbase = "server.ior";
-my $svcconf = "server$PerlACE::svcconf_ext";
 my $server_iorfile = $server->LocalFile ($iorbase);
-my $server_svcfile = $server->LocalFile ($svcconf);
 my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
+my $svcconf = "server$PerlACE::svcconf_ext";
+my $server_svcfile = $server->LocalFile ($svcconf);
+if ($server->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
+
+
 $SV = $server->CreateProcess ("ping",
                               "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("pong",
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl b/TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl
index 9b33af7e783..2eee604e0a9 100755
--- a/TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl
@@ -13,8 +13,20 @@ my $exit_status = 0;
 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 $client_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
-my $server_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
+my $client_conf_base = "mt_noupcall$PerlACE::svcconf_ext";
+my $client_conf = $server->LocalFile ($client_conf_base);
+if ($client->PutFile ($client_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
+
+
+my $server_conf_base = "mt_noupcall$PerlACE::svcconf_ext";
+my $server_conf = $server->LocalFile ($server_conf_base);
+if ($client->PutFile ($server_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$server_conf>\n";
+    exit 1;
+}
 
 $debug_level = '0';
 foreach $i (@ARGV) {
diff --git a/TAO/tests/POA/EndpointPolicy/run_test_dh.pl b/TAO/tests/POA/EndpointPolicy/run_test_dh.pl
index 85efd52677c..3d4b8d97310 100755
--- a/TAO/tests/POA/EndpointPolicy/run_test_dh.pl
+++ b/TAO/tests/POA/EndpointPolicy/run_test_dh.pl
@@ -14,6 +14,16 @@ $port = 12345;
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
+# configuration not passed to the server by the command line but the server
+# will open it.
+my $svcconf = "multi_prot.conf";
+my $server_svcfile = $server->LocalFile ($svcconf);
+if ($server->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
+
 $iiopSV = $server->CreateProcess ("server", "-ORBDottedDecimalAddresses 0 -ORBUseSharedProfile 1 -h default -p $port");
 
 print "Starting server using only IIOP\n";