diff options
author | msmit <msmit@remedy.nl> | 2011-09-15 07:41:19 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2011-09-15 07:41:19 +0000 |
commit | 896398bfce51d32b78ed278bf17fbca7453c30b2 (patch) | |
tree | ba137b6ed750e5a727a9f6927315d10d32fbb02e /TAO | |
parent | 96ad6525f66f03193580cecb65f06f808b56e3ef (diff) | |
download | ATCD-896398bfce51d32b78ed278bf17fbca7453c30b2.tar.gz |
Thu Sep 15 07:42:01 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/AMI/run_test.pl:
* tests/Bug_2183_Regression/run_test.pl:
* tests/Bug_2186_Regression/run_test.pl:
* tests/Bug_2935_Regression/run_test.pl:
* tests/Bug_3068_Regression/run_test.pl:
* tests/Leader_Followers/run_test.pl:
* tests/Oneway_Send_Timeouts/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.
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 13 | ||||
-rwxr-xr-x | TAO/tests/AMI/run_test.pl | 15 | ||||
-rwxr-xr-x | TAO/tests/Bug_2183_Regression/run_test.pl | 14 | ||||
-rwxr-xr-x | TAO/tests/Bug_2186_Regression/run_test.pl | 11 | ||||
-rwxr-xr-x | TAO/tests/Bug_2935_Regression/run_test.pl | 13 | ||||
-rwxr-xr-x | TAO/tests/Bug_3068_Regression/run_test.pl | 17 | ||||
-rwxr-xr-x | TAO/tests/Leader_Followers/run_test.pl | 27 | ||||
-rwxr-xr-x | TAO/tests/Oneway_Send_Timeouts/run_test.pl | 14 |
8 files changed, 112 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2b65c18ed36..ac79592cbdb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Thu Sep 15 07:42:01 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/AMI/run_test.pl: + * tests/Bug_2183_Regression/run_test.pl: + * tests/Bug_2186_Regression/run_test.pl: + * tests/Bug_2935_Regression/run_test.pl: + * tests/Bug_3068_Regression/run_test.pl: + * tests/Leader_Followers/run_test.pl: + * tests/Oneway_Send_Timeouts/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 14 07:34:56 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tao/TAO_Internal.cpp: diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index 29fe59a71aa..c02a5175c5d 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -11,25 +11,28 @@ 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 ("muxed$PerlACE::svcconf_ext"); $server_debug_level = '0'; $client_debug_level = '0'; $iterations = '1'; +$conf_file = "muxed$PerlACE::svcconf_ext"; + foreach $i (@ARGV) { if ($i eq '-mux') { - $client_conf = $client->LocalFile ("muxed$PerlACE::svcconf_ext"); + $conf_file = "muxed$PerlACE::svcconf_ext"; } elsif ($i eq '-debug') { $server_debug_level = '1'; $client_debug_level = '1'; } elsif ($i eq '-exclusive') { - $client_conf = $client->LocalFile ("exclusive$PerlACE::svcconf_ext"); + $conf_file = "exclusive$PerlACE::svcconf_ext"; } } +$client_conf = $client->LocalFile ($conf_file); + my $iorbase = "server.ior"; my $server_iorfile = $server->LocalFile ($iorbase); my $client_iorfile = $client->LocalFile ($iorbase); @@ -61,6 +64,12 @@ if ($client->PutFile ($iorbase) == -1) { $SV->Kill (); $SV->TimedWait (1); exit 1; } +# copy the configruation file. +if ($client->PutFile ($conf_file) == -1) { + print STDERR "ERROR: cannot set file <$client_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} $CL = $client->CreateProcess ("simple_client", "-ORBsvcconf $client_conf " diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl index 46af18e1354..a201bdb4861 100755 --- a/TAO/tests/Bug_2183_Regression/run_test.pl +++ b/TAO/tests/Bug_2183_Regression/run_test.pl @@ -15,9 +15,12 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail # The server IOR file $iorbase = "server.ior"; - -$server_conf = $server->LocalFile ("server.conf"); $server_ior_file = $server->LocalFile ($iorbase); + +# The server configuration file +$server_conf_file = "server.conf"; +$server_conf = $server->LocalFile ($server_conf_file); + $server->DeleteFile ($iorbase); # The client and server processes @@ -29,6 +32,13 @@ if ($^O == 'VMS') { $port = '15000'; +# copy the configuation file +if ($server->PutFile ($server_conf_file) == -1) { + print STDERR "ERROR: cannot set file <$server_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} + $SV = $server->CreateProcess ("server", "-o $server_ior_file " . "-ORBEndpoint iiop://:$port " . diff --git a/TAO/tests/Bug_2186_Regression/run_test.pl b/TAO/tests/Bug_2186_Regression/run_test.pl index 5b158671660..14e5a634f72 100755 --- a/TAO/tests/Bug_2186_Regression/run_test.pl +++ b/TAO/tests/Bug_2186_Regression/run_test.pl @@ -31,7 +31,16 @@ $client->DeleteFile($iorbase); my $client_iorbase_file = $client->LocalFile ($client_iorbase); $client->DeleteFile($client_iorbase); -my $server_conf = $server->LocalFile ("server.conf"); +my $server_conf_file = "server.conf"; +my $server_conf = $server->LocalFile ($server_conf_file); + + +# copy the configuation file +if ($server->PutFile ($server_conf_file) == -1) { + print STDERR "ERROR: cannot set file <$server_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . diff --git a/TAO/tests/Bug_2935_Regression/run_test.pl b/TAO/tests/Bug_2935_Regression/run_test.pl index 64a4acd9aa6..d74177e77a7 100755 --- a/TAO/tests/Bug_2935_Regression/run_test.pl +++ b/TAO/tests/Bug_2935_Regression/run_test.pl @@ -49,8 +49,19 @@ $middle->DeleteFile ($middlelogfilebase); $source->DeleteFile ($sourcelogfilebase); +my $middleconffilebase = "middle.conf"; +my $middleconffile = $middle->LocalFile ($middleconffilebase); + +# copy the configuation file +if ($middle->PutFile ($middleconffilebase) == -1) { + print STDERR "ERROR: cannot set file <$middleconffile>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} + + $SV = $sink->CreateProcess ("sink", "-o $sinkiorfile -orblogfile $sinklogfile -orbdebuglevel 9"); -$MD = $middle->CreateProcess ("middle", "-o $middleiorfile -f $sinkiorfile -ORBSvcConf middle.conf -orblogfile $middlelogfile -orbdebuglevel 9"); +$MD = $middle->CreateProcess ("middle", "-o $middleiorfile -f $sinkiorfile -ORBSvcConf $middleconffile -orblogfile $middlelogfile -orbdebuglevel 9"); $CL = $source->CreateProcess ("source", "-f $middleiorfile -orblogfile $sourcelogfile -orbdebuglevel 9"); $SV->Spawn (); diff --git a/TAO/tests/Bug_3068_Regression/run_test.pl b/TAO/tests/Bug_3068_Regression/run_test.pl index 74ef14252e6..456f2895ad2 100755 --- a/TAO/tests/Bug_3068_Regression/run_test.pl +++ b/TAO/tests/Bug_3068_Regression/run_test.pl @@ -26,8 +26,21 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -my $server_conf = $server->LocalFile ("server.conf"); -my $client_conf = $client->LocalFile ("client.conf"); +my $server_conf_base = "server.conf"; +my $client_conf_base = "client.conf"; +my $server_conf = $server->LocalFile ($server_conf_base); +my $client_conf = $client->LocalFile ($client_conf_base); + +if ($server->PutFile ($server_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$server_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($client_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$client_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl index 8935ffa36c4..ba7cf1d9d8e 100755 --- a/TAO/tests/Leader_Followers/run_test.pl +++ b/TAO/tests/Leader_Followers/run_test.pl @@ -24,11 +24,15 @@ my $iorbase = "lf.ior"; my $tp_conf_base = "tp$PerlACE::svcconf_ext"; my $select_mt_conf_base = "select_mt$PerlACE::svcconf_ext"; +# init server configuration files my $server_tp_conf_file = $server->LocalFile ($tp_conf_base); my $server_select_mt_conf_file = $server->LocalFile ($select_mt_conf_base); + +# init client configuration files my $client_tp_conf_file = $client->LocalFile ($tp_conf_base); my $client_select_mt_conf_file = $client->LocalFile ($select_mt_conf_base); +# init ior files my $server_iorfile = $server->LocalFile ($iorbase); my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); @@ -177,6 +181,29 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } +# Copy configuration files to the targets +if ($server->PutFile ($tp_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$server_tp_conf_file>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} +if ($server->PutFile ($select_mt_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$server_select_mt_conf_file>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} + +if ($client->PutFile ($tp_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$client_tp_conf_file>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} +if ($client->PutFile ($select_mt_conf_base) == -1) { + print STDERR "ERROR: cannot set file <$client_select_mt_conf_file>\n"; + $SV->Kill (); $SV->TimedWait (1); + return 1; +} + if ($single == 1) { print STDERR "\n\n*** Single threaded server ***\n\n\n"; $run_status = run_server("-ORBsvcconf $server_select_mt_conf_file"); diff --git a/TAO/tests/Oneway_Send_Timeouts/run_test.pl b/TAO/tests/Oneway_Send_Timeouts/run_test.pl index 9fddebaff12..de9e43501f1 100755 --- a/TAO/tests/Oneway_Send_Timeouts/run_test.pl +++ b/TAO/tests/Oneway_Send_Timeouts/run_test.pl @@ -14,7 +14,7 @@ $status = 0; $debug_level = '0'; $test_port = 12345; $management_port = 12346; -$client_conf = $target->LocalFile ("lf_flush.conf"); +$conf_file = "lf_flush.conf"; $flush_strategy = "LF"; foreach $i (@ARGV) { @@ -22,11 +22,11 @@ foreach $i (@ARGV) { $debug_level = '10'; } elsif ($i eq '-blocking') { - $client_conf = "block_flush.conf"; + $conf_file = $block_flush; $flush_strategy = "BLOCKING"; } elsif ($i eq '-reactive') { - $client_conf = "reactive_flush.conf"; + $conf_file = $reactive_flush; $flush_strategy = "REACTIVE"; } else { @@ -35,6 +35,14 @@ foreach $i (@ARGV) { } } +$client_conf = $target->LocalFile ($conf_file); + +if ($target->PutFile ($conf_file) == -1) { + print STDERR "ERROR: cannot set file <$client_conf>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + my $test_opts = "-s \'-ORBEndpoint iiop://localhost:$test_port -ORBEndpoint " . "iiop://localhost:$management_port -ORBDebuglevel $debug_level -ORBCollocation " . "no -ORBGestalt LOCAL\' -c \'-k corbaloc::localhost:$test_port/Test -b " . |