Fri Sep 16 12:01:35 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl:
        * tests/CSD_Collocation/run_test.pl:
        * tests/Connection_Purging/run_test.pl:
        * tests/Hang_Shutdown/run_test.pl:
        * tests/LongUpcalls/run_test.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.

6 files changed, 57 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9c440edc9e3..75e4f5251d4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Sep 16 12:01:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl:
+        * tests/CSD_Collocation/run_test.pl:
+        * tests/Connection_Purging/run_test.pl:
+        * tests/Hang_Shutdown/run_test.pl:
+        * tests/LongUpcalls/run_test.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:55:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * tests/Faults/run_test.pl:
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
index 3c8b6d058ce..67e95fc1752 100755
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
@@ -39,6 +39,12 @@ $client4->DeleteFile($iorbase);
 
 my $hostname = $server->HostName ();
 
+# Copy configuration file first
+if ($server->PutFile ($svcbase) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
 $SV = $server->CreateProcess ("MessengerServer",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBSvcConf $server_svcfile " .
diff --git a/TAO/tests/CSD_Collocation/run_test.pl b/TAO/tests/CSD_Collocation/run_test.pl
index d8a46d5d5af..ee93aa41e11 100755
--- a/TAO/tests/CSD_Collocation/run_test.pl
+++ b/TAO/tests/CSD_Collocation/run_test.pl
@@ -9,8 +9,14 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
 my $svcconf = "svc.conf.csd";
 my $server_svcconf = $server->LocalFile ($svcconf);
+if ($server->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcconf>\n";
+    exit 1;
+}
+
 
 $SV = $server->CreateProcess ("Collocation",  "-ORBSvcConf $server_svcconf");
 
diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl
index 7355ed2174a..610f042cbd9 100755
--- a/TAO/tests/Connection_Purging/run_test.pl
+++ b/TAO/tests/Connection_Purging/run_test.pl
@@ -70,7 +70,12 @@ for($i = 0; $i < $server_count; $i++) {
         $servers_endpoint[$i] = "-ORBEndpoint uiop://$servers_socket[$i]";
     }
     elsif ($use_shmiop) {
-        $server_shmiop_conf = $servers[$i]->LocalFile ("server_shmiop$PerlACE::svcconf_ext");
+        $server_conf_base = "server_shmiop$PerlACE::svcconf_ext";
+        $server_shmiop_conf = $servers[$i]->LocalFile ($server_shmiop_conf);
+        if ($servers[$i]->PutFile ($server_conf_base) == -1) {
+            print STDERR "ERROR: cannot set file <$server_shmiop_conf>\n";
+            exit 1;
+        }
         $servers_endpoint[$i] = "-ORBEndpoint shmiop:// -ORBSvcConf $server_shmiop_conf";
     }
     else {
@@ -114,9 +119,13 @@ for($i = 0; $i < $clients_count; $i++) {
     if ($debug_level < 1) {
         $debug_level = 1; #min value for debug level is one
     }
+    $client_conf_file = $clients[$i]->LocalFile ($clients_conf[$i]);
+    if ($clients[$i]->PutFile ($clients_conf[$i]) == -1) {
+        print STDERR "ERROR: cannot set file <$client_conf_file>\n";
+    }
     $CLS[$i] = $clients[$i]->CreateProcess ("client", "-ORBDebugLevel $debug_level ".
                                                       "-k $clients_iorfile[$i] ".
-                                                      "-ORBSvcConf $clients_conf[$i]");
+                                                      "-ORBSvcConf $client_conf_file");
 
     my $client_status = $CLS[$i]->SpawnWaitKill ($clients[$i]->ProcessStartWaitInterval() + 75);
 
diff --git a/TAO/tests/Hang_Shutdown/run_test.pl b/TAO/tests/Hang_Shutdown/run_test.pl
index 30053fac738..fc72acb06b6 100755
--- a/TAO/tests/Hang_Shutdown/run_test.pl
+++ b/TAO/tests/Hang_Shutdown/run_test.pl
@@ -50,8 +50,16 @@ $client->DeleteFile($iorbase);
 ################################
 print STDERR "===== Client with RW handler\n";
 
+my $svcconf = "client.conf";
+my $client_svcfile = $client->LocalFile ($svcconf);
+
+if ($client->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$client_svcfile>\n";
+    exit 1;
+}
+
 $SV2 = $server->CreateProcess ("server");
-$CL2 = $client->CreateProcess ("client", " -ORBSvcConf client.conf");
+$CL2 = $client->CreateProcess ("client", " -ORBSvcConf $client_svcfile");
 
 $SV2->Spawn ();
 
diff --git a/TAO/tests/LongUpcalls/run_test.pl b/TAO/tests/LongUpcalls/run_test.pl
index 16f79a0d149..8f2d8989e02 100755
--- a/TAO/tests/LongUpcalls/run_test.pl
+++ b/TAO/tests/LongUpcalls/run_test.pl
@@ -21,14 +21,25 @@ 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 = "svc$PerlACE::svcconf_ext";
 my $server_iorfile = $server->LocalFile ($iorbase);
-my $server_svcfile = $server->LocalFile ($svcconf);
 my $client_iorfile = $client->LocalFile ($iorbase);
-my $client_svcfile = $client->LocalFile ($svcconf);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
+my $svcconf = "svc$PerlACE::svcconf_ext";
+my $server_svcfile = $server->LocalFile ($svcconf);
+my $client_svcfile = $client->LocalFile ($svcconf);
+
+if ($client->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$client_svcfile>\n";
+    exit 1;
+}
+if ($server->PutFile ($svcconf) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
+
 print STDERR "==== Server upcall waits for operations on other threads\n";
 
 $SV = $server->CreateProcess ("blocking_server",