From eb7fca8b20d0b1fbd1096788568cfb858630f65d Mon Sep 17 00:00:00 2001 From: dbudko Date: Wed, 18 Nov 2009 13:00:45 +0000 Subject: Wed Nov 18 12:58:16 UTC 2009 Denis Budko * orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl: * orbsvcs/tests/Bug_2925_Regression/run_test.pl: * orbsvcs/tests/Security/Secure_Invocation/run_test.pl: * orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp: * orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp: * orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: * orbsvcs/tests/Security/BiDirectional/run_test.pl: * orbsvcs/tests/Security/Big_Request/run_test.pl: * orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: * orbsvcs/tests/Property/run_test.pl: * orbsvcs/tests/Bug_2316_Regression/client.cpp: * orbsvcs/tests/Bug_2316_Regression/server.cpp: * orbsvcs/tests/Bug_2316_Regression/run_test.pl: * orbsvcs/tests/Bug_2615_Regression/client.cpp: * orbsvcs/tests/Bug_2615_Regression/server.cpp: * orbsvcs/tests/Bug_2615_Regression/run_test.pl: * orbsvcs/tests/Bug_3216_Regression/run_test.pl: * orbsvcs/tests/Bug_2709_Regression/client.cpp: * orbsvcs/tests/Bug_2709_Regression/server.cpp: * orbsvcs/tests/Bug_2709_Regression/run_test.pl: * orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: * orbsvcs/tests/Bug_3215_Regression/run_test.pl: * orbsvcs/tests/Bug_2287_Regression/run_test.pl: * DevGuideExamples/SmartProxies/MessengerServer.cpp: * DevGuideExamples/SmartProxies/LoggerServer.cpp: * DevGuideExamples/SmartProxies/MessengerClient.cpp: * DevGuideExamples/SmartProxies/run_test.pl: * performance-tests/Latency/DSI/run_test.pl: * performance-tests/Latency/Deferred/run_test.pl: * performance-tests/Latency/DII/run_test.pl: * performance-tests/Latency/AMI/run_test.pl: * performance-tests/Throughput/run_test.pl: * tests/AMI_Buffering/run_message_count.pl: * tests/Bug_1495_Regression/run_test_complex.pl: * tests/Bug_1495_Regression/run_test.pl: * tests/Crashed_Callback/run_test.pl: * tests/BiDirectional/run_test_bug3282.pl: * tests/Bug_1020_Basic_Regression/run_test.pl: * tests/CallbackTest/run_test_ipv6.pl: * tests/CallbackTest/run_test_mixed_ip.pl: * tests/Bug_2289_Regression/run_test.pl: * tests/DIOP/run_test_ipv6.pl: * tests/DIOP/run_test.pl: * tests/NestedUpcall/Triangle_Test/run_test.pl: * tests/MT_Timeout/run_test.pl: * tests/Single_Read/server.cpp: * tests/Single_Read/test_i.cpp: * tests/Single_Read/run_test.pl: * tests/Single_Read/test_i.h: * examples/Logging/run_test.pl: * examples/Simple/time-date/run_test.pl: * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl: * examples/PluggableUDP/tests/Performance/run_test.pl: Tests are converted to use new test framework and added to fuzz build. --- TAO/examples/Logging/run_test.pl | 57 +++++++-------- .../PluggableUDP/tests/Performance/run_test.pl | 82 ++++++++++++++------- .../tests/Performance/run_test_ipv6.pl | 83 +++++++++++++++------- TAO/examples/Simple/time-date/run_test.pl | 71 +++++++++++------- 4 files changed, 187 insertions(+), 106 deletions(-) (limited to 'TAO/examples') diff --git a/TAO/examples/Logging/run_test.pl b/TAO/examples/Logging/run_test.pl index 3d2195c015d..1bde659124e 100755 --- a/TAO/examples/Logging/run_test.pl +++ b/TAO/examples/Logging/run_test.pl @@ -1,52 +1,53 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- -# This is a Perl script that runs the Logger client and server - use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; +$debug_level = '0'; -# amount of delay between running the servers -$sleeptime = 15; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("Logging_Service"); -} -else { - $SV = new PerlACE::Process ("Logging_Service"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CL = new PerlACE::Process ("Logging_Test"); -# Start the service -$server = $SV->Spawn (); +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"; + +my $sleeptime = 15; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("Logging_Service"); +$CL = $client->CreateProcess ("Logging_Test"); +$server_status = $SV->Spawn (); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; exit 1; } -# Give the service time to settle -sleep $sleeptime; +sleep $server->ProcessStartWaitInterval(); -# Start the client -$client = $CL->SpawnWaitKill (60); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); -if ($client != 0) { - print STDERR "ERROR: test returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -# Kill the service -$server = $SV->TerminateWaitKill (5); +$server_status = $SV->TerminateWaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: service returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl index 344296fdfa5..cfc8408e88a 100755 --- a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl +++ b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl @@ -1,54 +1,82 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; -$iorbase = "test.ior"; -$iorfile = PerlACE::LocalFile ("$iorbase"); +$debug_level = '0'; +$port_server = '12345'; +$port_client = '12346'; -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'}; - $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorbase"); -} -else { - $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://:12346"); -$server = $SV->Spawn (); +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"; + +my $iorbase = "test.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", + "-ORBdebuglevel $debug_level " . + "-ORBEndpoint diop://:$port_server " . + "-o $server_iorfile"); + +$CL = $client->CreateProcess ("client", + "-ORBEndpoint diop://:$port_client " . + "-k file://$client_iorfile"); + +$server_status = $SV->Spawn (); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; exit 1; } -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: could not find file <$iorfile>\n"; - $SV->Kill (); +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (90); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 75); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (10); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); exit $status; diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl index e1066e6e2a6..1c4ce05783c 100755 --- a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl +++ b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl @@ -1,54 +1,83 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; -$iorbase = "test.ior"; -$iorfile = PerlACE::LocalFile ("$iorbase"); +$debug_level = '0'; +$port_server = '12345'; +$port_client = '12346'; +$hostname = '[::1]'; -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'}; - $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorbase"); -} -else { - $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile"); +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } } -$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://[::1]:12346"); -$server = $SV->Spawn (); +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"; + +my $iorbase = "test.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", + "-ORBdebuglevel $debug_level " . + "-ORBEndpoint diop://$hostname:$port_server " . + "-o $server_iorfile"); + +$CL = $client->CreateProcess ("client", + "-ORBEndpoint diop://$hostname:$port_client " . + "-k file://$client_iorfile"); + +$server_status = $SV->Spawn (); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; exit 1; } -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: could not find file <$iorfile>\n"; - $SV->Kill (); +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (90); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 75); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill (10); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); exit $status; diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl index 092430e81ce..006fb4b759d 100755 --- a/TAO/examples/Simple/time-date/run_test.pl +++ b/TAO/examples/Simple/time-date/run_test.pl @@ -1,52 +1,75 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; + & eval 'exec perl -S $0 $argv:q' + if 0; # $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; +use PerlACE::TestTarget; $status = 0; -$iorfile = "ior"; -$conf = PerlACE::LocalFile ("client" . "$PerlACE::svcconf_ext"); +$debug_level = '0'; -# Remove the file before starting the test. -unlink $iorfile; +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +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"; -PerlACE::add_lib_path ('.'); +my $iorbase = "ior"; # please note that conf file is defined in *.conf file +my $client_conffile = $client->LocalFile ($PerlACE::svcconf_ext); +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server"); +$SV = $server->CreateProcess ("server", ""); +$CL = $client->CreateProcess ("client", "-f $client_iorfile -x -ORBSvcConf $client_conffile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; } -else { - $SV = new PerlACE::Process ("server"); + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; } -$CL = new PerlACE::Process ("client", "-f $iorfile -x -ORBSvcConf $conf"); -$SV->Spawn (); +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: waiting for file <$iorfile>\n"; - $SV->Kill (); +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); exit 1; } -$client = $CL->SpawnWaitKill (60); +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; $status = 1; } -$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown); +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -unlink $iorfile; +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); exit $status; -- cgit v1.2.1