From 76bb32264ea5bf1adf67b6e39ae852f9a31a91b2 Mon Sep 17 00:00:00 2001 From: msmit Date: Fri, 16 Sep 2011 07:00:21 +0000 Subject: Fri Sep 16 07:02:26 UTC 2011 Marcel Smit * tests/Bug_3163_Regression/run_test.pl: * tests/Bug_3630_Regression/run_test.pl: * tests/Bug_3683_Regression/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. * tests/Bug_3630_Regression/server.cpp: Added \n --- TAO/ChangeLog | 14 +++++++++++++- TAO/tests/Bug_3163_Regression/run_test.pl | 11 ++++++++++- TAO/tests/Bug_3630_Regression/run_test.pl | 9 +++++++++ TAO/tests/Bug_3630_Regression/server.cpp | 2 +- TAO/tests/Bug_3683_Regression/run_test.pl | 10 +++++++++- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ac79592cbdb..5304749ebef 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Fri Sep 16 07:02:26 UTC 2011 Marcel Smit + + * tests/Bug_3163_Regression/run_test.pl: + * tests/Bug_3630_Regression/run_test.pl: + * tests/Bug_3683_Regression/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. + + * tests/Bug_3630_Regression/server.cpp: + Added \n + Thu Sep 15 07:42:01 UTC 2011 Marcel Smit * tests/AMI/run_test.pl: @@ -8,7 +20,7 @@ Thu Sep 15 07:42:01 UTC 2011 Marcel Smit * 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 + 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 diff --git a/TAO/tests/Bug_3163_Regression/run_test.pl b/TAO/tests/Bug_3163_Regression/run_test.pl index 57a4cf1d82a..fa73fd42065 100755 --- a/TAO/tests/Bug_3163_Regression/run_test.pl +++ b/TAO/tests/Bug_3163_Regression/run_test.pl @@ -21,13 +21,22 @@ 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 = "server.conf"; my $server_iorfile = $server->LocalFile ($iorbase); + +my $svcconf = "server.conf"; my $server_svcconf = $server->LocalFile ($svcconf); + my $client_iorfile = $client->LocalFile ($iorbase); + $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); +if ($server->PutFile ($svcconf) == -1) { + print STDERR "ERROR: cannot set file <$server_svcconf>\n"; + exit 1; +} + + $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile -ORBStdProfileComponents 0 -ORBSvcConf $server_svcconf"); $CL = $client->CreateProcess ("client", "-v 131401 -k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/tests/Bug_3630_Regression/run_test.pl b/TAO/tests/Bug_3630_Regression/run_test.pl index 55adb524064..2b5d3559de4 100755 --- a/TAO/tests/Bug_3630_Regression/run_test.pl +++ b/TAO/tests/Bug_3630_Regression/run_test.pl @@ -10,6 +10,15 @@ use PerlACE::TestTarget; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $srvconf = "TAO Conf File.conf"; +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 ("server"); $server_status = $SV->Spawn (); diff --git a/TAO/tests/Bug_3630_Regression/server.cpp b/TAO/tests/Bug_3630_Regression/server.cpp index 55ff6e69e3d..99119586e4a 100644 --- a/TAO/tests/Bug_3630_Regression/server.cpp +++ b/TAO/tests/Bug_3630_Regression/server.cpp @@ -94,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (result == 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Test passed!"))); + ACE_TEXT ("Test passed!\n"))); else ACE_ERROR ((LM_ERROR, ACE_TEXT ("Test failed. Result: %d\n"), diff --git a/TAO/tests/Bug_3683_Regression/run_test.pl b/TAO/tests/Bug_3683_Regression/run_test.pl index 6b1960d9b26..5605748ea5d 100755 --- a/TAO/tests/Bug_3683_Regression/run_test.pl +++ b/TAO/tests/Bug_3683_Regression/run_test.pl @@ -26,8 +26,16 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); +my $clientconf = "svc.conf"; +my $clientconffile = $client->LocalFile ($clientconf); + +if ($client->PutFile ($clientconf) == -1) { + print STDERR "ERROR: cannot set file <$clientconffile>\n"; + exit 1; +} + $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); -$CL = $client->CreateProcess ("client", "-f $client_iorfile -x -ORBSvcConf svc.conf -p 16"); +$CL = $client->CreateProcess ("client", "-f $client_iorfile -x -ORBSvcConf $clientconffile -p 16"); $server_status = $SV->Spawn (); if ($server_status != 0) { -- cgit v1.2.1