ChangeLogTag TAO:Fri Apr 4 08:40:43 UTC 2014 Martin Corino <mcorino@remedy.nl>

ChangeLogTag ACE:Fri Apr  4 08:38:05 UTC 2014  Martin Corino <mcorino@remedy.nl>

2 files changed, 38 insertions, 7 deletions

diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/run_test.pl b/TAO/tests/Dynamic_TP/ORB_ThreadPool/run_test.pl
index bd9c07d3d1f..2d6c81acb13 100755
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/run_test.pl
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/run_test.pl
@@ -42,6 +42,20 @@ $middle->DeleteFile($siorbase);
 $middle->DeleteFile($miorbase);
 $client->DeleteFile($miorbase);
 
+# copy the configuation files
+if ($server->PutFile ('server.conf') == -1) {
+    print STDERR "ERROR: cannot set file <".$server->LocalFile ('server.conf').">\n";
+    exit 1;
+}
+if ($middle->PutFile ('middle.conf') == -1) {
+    print STDERR "ERROR: cannot set file <".$middle->LocalFile ('middle.conf').">\n";
+    exit 1;
+}
+if ($client->PutFile ('client.conf') == -1) {
+    print STDERR "ERROR: cannot set file <".$client->LocalFile ('client.conf').">\n";
+    exit 1;
+}
+
 $SV = $server->CreateProcess ("server", "$sdebug -ORBSvcConf server.conf -ORBDynamicThreadPoolName ORBPool -o $server_iorfile");
 $MD = $middle->CreateProcess ("middle", "$mdebug -ORBSvcConf middle.conf -ORBDynamicThreadPoolName ORBPool -o $middle_siorfile -k file://$middle_ciorfile");
 $CL = $client->CreateProcess ("client", "$cdebug -ORBSvcConf client.conf -k file://$client_iorfile -n $threads -s $delay -x");
@@ -66,13 +80,6 @@ if ($server->GetFile ($siorbase) == -1) {
     exit 1;
 }
 
-
-if ($middle->PutFile ($miorbase) == -1) {
-    print STDERR "ERROR: cannot set file <$middle_ciorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
 $middle_status = $MD->Spawn ();
 
 if ($middle_status != 0) {
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
index 1d7efc06f2a..5d0fd4a25de 100755
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
@@ -48,6 +48,12 @@ sub test_1
     my $server_logfile = $server->LocalFile ($lfname);
     my $svc_conf = $server->LocalFile($scname);
 
+    # copy the configuation file
+    if ($server->PutFile ($scname) == -1) {
+        print STDERR "ERROR: cannot set file <$svc_conf>\n";
+        return 1;
+    }
+
     $server->DeleteFile($lfname);
 
     $SV = $server->CreateProcess ("server", " -ORBDebugLevel 5 -ORBSvcConf $svc_conf -ORBLogFile $server_logfile -s 3 -o $server_iorfile");
@@ -126,6 +132,12 @@ sub test_2
     my $server_logfile = $server->LocalFile ($lfname);
     my $svc_conf = $server->LocalFile($scname);
 
+    # copy the configuation file
+    if ($server->PutFile ($scname) == -1) {
+        print STDERR "ERROR: cannot set file <$svc_conf>\n";
+        return 1;
+    }
+
     $server->DeleteFile($lfname);
 
     $SV = $server->CreateProcess ("server", " -ORBDebugLevel 5 -ORBSvcConf $svc_conf -ORBLogFile $server_logfile -s 3 -o $server_iorfile");
@@ -207,6 +219,12 @@ sub test_3
     my $server_logfile = $server->LocalFile ($lfname);
     my $svc_conf = $server->LocalFile($scname);
 
+    # copy the configuation file
+    if ($server->PutFile ($scname) == -1) {
+        print STDERR "ERROR: cannot set file <$svc_conf>\n";
+        return 1;
+    }
+
     $server->DeleteFile($lfname);
 
     $SV = $server->CreateProcess ("server", " -ORBDebugLevel 5 -ORBSvcConf $svc_conf -ORBLogFile $server_logfile -s 3 -o $server_iorfile");
@@ -284,6 +302,12 @@ sub test_4
     my $server_logfile = $server->LocalFile ($lfname);
     my $svc_conf = $server->LocalFile($scname);
 
+    # copy the configuation file
+    if ($server->PutFile ($scname) == -1) {
+        print STDERR "ERROR: cannot set file <$svc_conf>\n";
+        return 1;
+    }
+
     $server->DeleteFile($lfname);
 
     $SV = $server->CreateProcess ("server", " -ORBDebugLevel 5 -ORBSvcConf $svc_conf -ORBLogFile $server_logfile -s 3 -o $server_iorfile");