diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-04-09 11:05:59 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-04-09 11:05:59 +0000 |
| commit | c46db90b09a631929cd709b6543af81ed481ff19 (patch) | |
| tree | cb7d6da3d02a5b8ae43f73ac5afd9135c8a23539 | |
| parent | dc76fed6346df71a4f986adbae5f28e154821b4f (diff) | |
| download | ATCD-c46db90b09a631929cd709b6543af81ed481ff19.tar.gz | |
ChangeLogTag: Thu Apr 9 11:01:26 UTC 2009 Vladimir Zykov <vz@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc | 8 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 45522b5a5d9..dfbf3cc0a07 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Apr 9 11:01:26 UTC 2009 Vladimir Zykov <vz@prismtech.com> + + * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp: + * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc: + + There were compile errors on Linux and Solaris builds with + previous attempt to fix octet sequence test on Windows. Now + those custom build steps are done only on windows builds. + Wed Apr 8 12:45:16 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * utils/NamingViewer/BindDialog.cpp diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc index cf97a1a6b77..eef7b2903d9 100644 --- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc +++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc @@ -99,9 +99,11 @@ project(*UB_Octet_Sequence): taoexe { project(*UB_Oct_Seq_No_Cpy): aceexe { exename = unbounded_octet_sequence_nocopy_ut includes += $(TAO_ROOT) - prebuild = <%cp%> $(TAO_ROOT)<%slash%>tao<%slash%>Unbounded_Octet_Sequence_T.h Unbounded_Octet_Sequence_T.h <%and%> \ - perl clean_tao_export.pl Unbounded_Octet_Sequence_T.h - postbuild = <%rm%> Unbounded_Octet_Sequence_T.h + specific (!automake, !gnuace) { + prebuild = <%cp%> $(TAO_ROOT)<%slash%>tao<%slash%>Unbounded_Octet_Sequence_T.h Unbounded_Octet_Sequence_T.h <%and%> \ + perl clean_tao_export.pl Unbounded_Octet_Sequence_T.h + postbuild = <%rm%> Unbounded_Octet_Sequence_T.h + } Source_Files { mock_reference.cpp unbounded_octet_sequence_nocopy_ut.cpp diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp index e70613d0e6c..fc164025fa8 100644 --- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp @@ -11,10 +11,14 @@ #include "testing_allocation_traits.hpp" #include "testing_range_checking.hpp" +#if defined (ACE_WIN32) || defined (ACE_WIN64) // This is a unit test and we use our local slightly // modified Unbounded_Octet_Sequence_T.h. See mpc file // for details. -#include "Unbounded_Octet_Sequence_T.h" +# include "Unbounded_Octet_Sequence_T.h" +#else +# include "tao/Unbounded_Octet_Sequence_T.h" +#endif #include "value_sequence_tester.hpp" |