summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-09-20 06:41:03 +0000
committermsmit <msmit@remedy.nl>2011-09-20 06:41:03 +0000
commit7157d0db7a5ba63d180e830c4273ca81c7a18643 (patch)
tree3e3498623e6dd8ddabcc400255c83d7612cc32be
parent01d2e284c6059039d7e821ab1d3685f1f2ee095e (diff)
downloadATCD-7157d0db7a5ba63d180e830c4273ca81c7a18643.tar.gz
Tue Sep 20 06:43:33 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/AMI/run_mt_noupcall.pl: * tests/MT_Client/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.
-rw-r--r--TAO/ChangeLog8
-rwxr-xr-xTAO/tests/AMI/run_mt_noupcall.pl7
-rwxr-xr-xTAO/tests/MT_Client/run_test.pl4
3 files changed, 18 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 798670842ba..bc485848d57 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 20 06:43:33 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * tests/AMI/run_mt_noupcall.pl:
+ * tests/MT_Client/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.
+
Tue Sep 20 06:27:42 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/Oneway_Send_Timeouts/run_test.pl:
diff --git a/TAO/tests/AMI/run_mt_noupcall.pl b/TAO/tests/AMI/run_mt_noupcall.pl
index 76ce949dbdd..72efcaa386b 100755
--- a/TAO/tests/AMI/run_mt_noupcall.pl
+++ b/TAO/tests/AMI/run_mt_noupcall.pl
@@ -11,7 +11,12 @@ use PerlACE::TestTarget;
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";
-$client_conf = $client->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
+$client_conf_base = "mt_noupcall$PerlACE::svcconf_ext";
+$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;
+}
$server_debug_level = '0';
$client_debug_level = '0';
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index de410bbb050..e425d5c143a 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -43,6 +43,10 @@ $client->DeleteFile($iorbase);
$server_conf1 = $server->LocalFile ($server_conf);
+if ($server->PutFile ($server_conf) == -1) {
+ print STDERR "ERROR: cannot set file <$server_conf1>\n";
+ exit 1;
+}
$SV = $server->CreateProcess ("server",
"-ORBdebuglevel $debug_level " .