diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-12 06:58:45 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-12 06:58:45 +0000 |
| commit | 0b9b63cf5d11386ac41e05660f4f7cd90057f300 (patch) | |
| tree | 63135184bd2bd8aff7560148d688c256ee821fd5 | |
| parent | 60834d42537fb702d6efb87420b65b1cb6a1aa50 (diff) | |
| download | ATCD-0b9b63cf5d11386ac41e05660f4f7cd90057f300.tar.gz | |
Mon Oct 12 06:57:13 UTC 2009 Vladimir Zykov <vz@prismtech.com>
* tests/Bug_3632_Regression/test.cpp:
Fixed this test after the changes for bug#3746.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/Bug_3632_Regression/test.cpp | 17 |
2 files changed, 20 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 516fe9f3137..6610bfe662d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,15 @@ +Mon Oct 12 06:57:13 UTC 2009 Vladimir Zykov <vz@prismtech.com> + + * tests/Bug_3632_Regression/test.cpp: + Fixed this test after the changes for bug#3746. + Fri Oct 9 11:50:49 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: * TAO_IDL/be/be_global.cpp: * TAO_IDL/be_include/be_codegen.h: * TAO_IDL/be_include/be_global.h: - + Fixed generation of export macro header files to track with -o <output dir> option similarly to the other generated files. Thanks to Abdullah Sowayan diff --git a/TAO/tests/Bug_3632_Regression/test.cpp b/TAO/tests/Bug_3632_Regression/test.cpp index d560ad838ed..fd5f1ade0d9 100644 --- a/TAO/tests/Bug_3632_Regression/test.cpp +++ b/TAO/tests/Bug_3632_Regression/test.cpp @@ -5,9 +5,20 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) { - Test::bounded_string_seq seq; - seq.length (11); - ACE_TEST_ASSERT (seq.maximum () == 10); + try + { + Test::bounded_string_seq seq; + seq.length (11); + ACE_TEST_ASSERT (seq.maximum () == 10); + } + catch (::CORBA::BAD_PARAM const &) + { + // ignore this exception since it's expected. + } + catch (::CORBA::Exception const &) + { + return 1; + } return 0; } |