diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 11:57:45 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 11:57:45 +0000 |
commit | ac5c2ae24122d585787fba28a321d901dc5234b4 (patch) | |
tree | 024f19d95a5fd42ab88fc6de8a766dfdbbe62863 | |
parent | 709ed56d7be3f59eec5d3c770dcd9e8370613fe6 (diff) | |
download | ATCD-ac5c2ae24122d585787fba28a321d901dc5234b4.tar.gz |
Mon Nov 17 11:57:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/ChangeLog | 14 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl | 51 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Bug_3049/run_test.pl | 39 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Bunch/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Separation/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Shared/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Simple/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl | 40 | ||||
-rwxr-xr-x | TAO/tests/ORB_Local_Config/run_tests_all.pl | 2 |
11 files changed, 116 insertions, 270 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e0fba16501b..6555e839c76 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Mon Nov 17 11:57:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/ORB_Local_Config/Bug_1459/run_test.pl + * tests/ORB_Local_Config/Bug_2612/run_test.pl + * tests/ORB_Local_Config/Bug_3049/run_test.pl + * tests/ORB_Local_Config/Bunch/run_test.pl + * tests/ORB_Local_Config/run_tests_all.pl + * tests/ORB_Local_Config/Separation/run_test.pl + * tests/ORB_Local_Config/Service_Dependency/run_test.pl + * tests/ORB_Local_Config/Shared/run_test.pl + * tests/ORB_Local_Config/Simple/run_test.pl + * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl + Converted to the new test framework + Mon Nov 17 11:25:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_2560_Regression/run_test.pl diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl index 618186bc8ba..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl @@ -1,52 +1,23 @@ 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; -sub add_path { - my($name) = shift; - my($value) = shift; - if (defined $ENV{$name}) { - $ENV{$name} .= ':' . $value - } - else { - $ENV{$name} = $value; - } -} - -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl index 4143eac7f72..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -else { - print STDERR "ERROR: Some test failed, status=$status\n"; -} -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_3049/run_test.pl index 47137b088d3..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Bug_3049/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Bug_3049/run_test.pl @@ -1,38 +1,23 @@ 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; -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -my $status = 0; -$status |= test("Test"); +$SV = $server->CreateProcess ("Test"); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Bunch/run_test.pl b/TAO/tests/ORB_Local_Config/Bunch/run_test.pl index 4ce32e2c7d8..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Bunch/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Bunch/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Separation/run_test.pl b/TAO/tests/ORB_Local_Config/Separation/run_test.pl index 4ce32e2c7d8..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Separation/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Separation/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl b/TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl index 4ce32e2c7d8..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Shared/run_test.pl b/TAO/tests/ORB_Local_Config/Shared/run_test.pl index 4ce32e2c7d8..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Shared/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Shared/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Simple/run_test.pl b/TAO/tests/ORB_Local_Config/Simple/run_test.pl index 4ce32e2c7d8..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Simple/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Simple/run_test.pl @@ -1,41 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = 0; -$status |= test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; +exit 0; diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl index 3aac2c7ecc9..57d2eb0909d 100755 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl @@ -1,39 +1,23 @@ 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; -# Set the library path for the client to be able to load the library -PerlACE::add_lib_path ('../lib'); +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +$server->AddLibPath ('../lib'); -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1; - if (PerlACE::is_vxworks_test()) { - $t1 = new PerlACE::ProcessVX ($executable, ($arguments ? $arguments : "")); - } - else { - $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - } - my $status = $t1->SpawnWaitKill (600); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} +$SV = $server->CreateProcess ("Test"); -my $status = test("Test"); +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } -exit $status; + +exit 0; diff --git a/TAO/tests/ORB_Local_Config/run_tests_all.pl b/TAO/tests/ORB_Local_Config/run_tests_all.pl index 02c6ff52858..6c34f2f3b19 100755 --- a/TAO/tests/ORB_Local_Config/run_tests_all.pl +++ b/TAO/tests/ORB_Local_Config/run_tests_all.pl @@ -33,7 +33,7 @@ sub test($) print STDERR "Test $executable reported success.\n"; return 0; -} +} my $status = 0; $status += test("Bug_1459"); |