summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-08-03 12:11:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-08-03 12:11:00 +0000
commitcb474595bc41d345ca554ab9594efa640a5783bd (patch)
treeee7690649fd6c548432893bf0effd628cf133288
parent839ce5c985fda709fbaa22e7ae23d9ae7d506718 (diff)
downloadATCD-cb474595bc41d345ca554ab9594efa640a5783bd.tar.gz
Mon Aug 3 12:09:40 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst: * tests/Bug_3701_Regression/*: Added test for bugzilla 3701 * tests/Timed_Buffered_Oneways/run_test.pl: * tests/Single_Read/run_test.pl: * tests/Server_Leaks/run_test.pl: * tests/POA/Persistent_ID/run_test.pl: * tests/Crash_On_Write/run_test.pl: Check return value of spawn
-rw-r--r--TAO/ChangeLog15
-rw-r--r--TAO/bin/tao_orb_tests.lst1
-rw-r--r--TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc9
-rw-r--r--TAO/tests/Bug_3701_Regression/client.cpp26
-rwxr-xr-xTAO/tests/Bug_3701_Regression/run_test.pl22
-rwxr-xr-xTAO/tests/Crash_On_Write/run_test.pl9
-rwxr-xr-xTAO/tests/POA/Persistent_ID/run_test.pl7
-rwxr-xr-xTAO/tests/Server_Leaks/run_test.pl7
-rwxr-xr-xTAO/tests/Single_Read/run_test.pl7
-rwxr-xr-xTAO/tests/Timed_Buffered_Oneways/run_test.pl7
10 files changed, 103 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6d89f33a872..2eb6357cddd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,22 @@
+Mon Aug 3 12:09:40 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/tao_orb_tests.lst:
+ * tests/Bug_3701_Regression/*:
+ Added test for bugzilla 3701
+
+ * tests/Timed_Buffered_Oneways/run_test.pl:
+ * tests/Single_Read/run_test.pl:
+ * tests/Server_Leaks/run_test.pl:
+ * tests/POA/Persistent_ID/run_test.pl:
+ * tests/Crash_On_Write/run_test.pl:
+ Check return value of spawn
+
Wed Jul 29 20:18:21 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/logWalker.cpp:
wchar build fix.
-
+
Wed Jul 29 03:43:38 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/HostProcess.h:
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index f1dd9784717..d4bbb607870 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -164,6 +164,7 @@ TAO/tests/Bug_3674_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
TAO/tests/Bug_3676_Regression/run_test.pl: !NO_MESSAGING
TAO/tests/Bug_3683_Regression/run_test.pl:
TAO/tests/Bug_3695_Regression/run_test.pl:
+TAO/tests/Bug_3701_Regression/run_test.pl:
TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT !WinCE !FUZZ
TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT !WinCE !FUZZ
TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
diff --git a/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
new file mode 100644
index 00000000000..e9fa8a23ed9
--- /dev/null
+++ b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Client): taoclient {
+ Source_Files {
+ client.cpp
+ }
+}
+
diff --git a/TAO/tests/Bug_3701_Regression/client.cpp b/TAO/tests/Bug_3701_Regression/client.cpp
new file mode 100644
index 00000000000..bcaafc79f4a
--- /dev/null
+++ b/TAO/tests/Bug_3701_Regression/client.cpp
@@ -0,0 +1,26 @@
+// $Id$
+
+#include "tao/SystemException.h"
+
+ACE_RCSID(Hello, client, "$Id$")
+
+int
+ACE_TMAIN(int, ACE_TCHAR *[])
+{
+ int result = 0;
+ try
+ {
+ throw CORBA::BAD_PARAM ();
+ }
+ catch (const CORBA::BAD_PARAM&)
+ {
+ // Correct exception
+ }
+ catch (const CORBA::Exception& ex)
+ {
+ ex._tao_print_exception ("Incorrect exception caught:");
+ ++result;
+ }
+
+ return result;
+}
diff --git a/TAO/tests/Bug_3701_Regression/run_test.pl b/TAO/tests/Bug_3701_Regression/run_test.pl
new file mode 100755
index 00000000000..2e0c5610736
--- /dev/null
+++ b/TAO/tests/Bug_3701_Regression/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+ & eval 'exec perl -S $0 $argv:q'
+ if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$SV = $server->CreateProcess ("client");
+
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+ print STDERR "ERROR: test returned $test\n";
+ exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Crash_On_Write/run_test.pl b/TAO/tests/Crash_On_Write/run_test.pl
index 8262e014e4f..f08f6226ad1 100755
--- a/TAO/tests/Crash_On_Write/run_test.pl
+++ b/TAO/tests/Crash_On_Write/run_test.pl
@@ -20,14 +20,19 @@ else {
}
$CL = new PerlACE::Process ("client", " -k file://$iorfile");
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+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: cannot find file <$iorfile>\n";
$SV->Kill (); $SV->TimedWait (1);
exit 1;
-}
+}
$client = $CL->SpawnWaitKill (180);
diff --git a/TAO/tests/POA/Persistent_ID/run_test.pl b/TAO/tests/POA/Persistent_ID/run_test.pl
index d6e3b6cbde4..50a883b3a4b 100755
--- a/TAO/tests/POA/Persistent_ID/run_test.pl
+++ b/TAO/tests/POA/Persistent_ID/run_test.pl
@@ -22,7 +22,12 @@ $status = 0;
$SV = $server->CreateProcess ("server", "-f $server_iorfile");
$CL = $client->CreateProcess ("client", "-k file://$client_iorfile -x");
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+ print STDERR "ERROR: server returned $server_status\n";
+ exit 1;
+}
if ($server->WaitForFileTimed ($iorbase,
$server->ProcessStartWaitInterval()) == -1) {
diff --git a/TAO/tests/Server_Leaks/run_test.pl b/TAO/tests/Server_Leaks/run_test.pl
index 6f3cb099b5a..538d3a76e22 100755
--- a/TAO/tests/Server_Leaks/run_test.pl
+++ b/TAO/tests/Server_Leaks/run_test.pl
@@ -32,7 +32,12 @@ else {
$SV = new PerlACE::Process ("server", "-o $iorfile");
}
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+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: cannot find file <$iorfile>\n";
diff --git a/TAO/tests/Single_Read/run_test.pl b/TAO/tests/Single_Read/run_test.pl
index bf809ac2f61..176c7d6ee9c 100755
--- a/TAO/tests/Single_Read/run_test.pl
+++ b/TAO/tests/Single_Read/run_test.pl
@@ -23,7 +23,12 @@ else {
}
$CL = new PerlACE::Process ("client", "-k file://$iorfile -d 10 -i 10 -x");
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+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) {
diff --git a/TAO/tests/Timed_Buffered_Oneways/run_test.pl b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
index a9d9fa6b607..e1580ed1c23 100755
--- a/TAO/tests/Timed_Buffered_Oneways/run_test.pl
+++ b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
@@ -21,7 +21,12 @@ else {
}
$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+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) {