diff options
| author | msmit <msmit@remedy.nl> | 2011-09-25 17:00:09 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-09-25 17:00:09 +0000 |
| commit | fd3f21e9a98ba85630ae728d7a431e561f369ca2 (patch) | |
| tree | 7652709d0e4d4c817f07c9b0b40fed74d52f0b8e | |
| parent | d088aacc41a35fc8c9b5062660e51c03763c178b (diff) | |
| download | ATCD-fd3f21e9a98ba85630ae728d7a431e561f369ca2.tar.gz | |
Sun Sep 25 17:02:27 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/Parallel_Connect_Strategy/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/ChangeLog | 7 | ||||
| -rwxr-xr-x | TAO/tests/Parallel_Connect_Strategy/run_test.pl | 20 |
2 files changed, 23 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0a5f8cb9d0c..6d546cffd03 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sun Sep 25 17:02:27 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/Parallel_Connect_Strategy/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. + Wed Sep 21 13:40:30 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tests/MT_Client/run_test.pl: diff --git a/TAO/tests/Parallel_Connect_Strategy/run_test.pl b/TAO/tests/Parallel_Connect_Strategy/run_test.pl index 33f491bb35f..d3c126b1f21 100755 --- a/TAO/tests/Parallel_Connect_Strategy/run_test.pl +++ b/TAO/tests/Parallel_Connect_Strategy/run_test.pl @@ -38,15 +38,27 @@ my $corbaloc = "corbaloc:". my $valid_ep = "-ORBListenEndpoints iiop://$TARGETHOSTNAME:$port"; my $iorbase = "server.ior"; -my $reactive_conf = "reactive$PerlACE::svcconf_ext"; -my $blocked_conf = "blocked$PerlACE::svcconf_ext"; my $server_iorfile = $server->LocalFile ($iorbase); my $client_iorfile = $client->LocalFile ($iorbase); -my $client_reactive_conf = $client->LocalFile ($reactive_conf); -my $client_blocked_conf = $client->LocalFile ($blocked_conf); + $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); +my $reactive_conf = "reactive$PerlACE::svcconf_ext"; +my $blocked_conf = "blocked$PerlACE::svcconf_ext"; +my $client_reactive_conf = $client->LocalFile ($reactive_conf); +my $client_blocked_conf = $client->LocalFile ($blocked_conf); + +if ($client->PutFile ($reactive_conf) == -1) { + print STDERR "ERROR: cannot set file <$client_reactive_conf>\n"; + exit 1; +} + +if ($client->PutFile ($blocked_conf) == -1) { + print STDERR "ERROR: cannot set file <$client_blocked_conf>\n"; + exit 1; +} + $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ". "-ORBUseSharedProfile 1 ". |