From 50f9ae5a90c6a73890c9c4b12aedf90fa48b8bcf Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 28 Apr 2009 18:00:14 +0000 Subject: CWS-TOOLING: integrate CWS sb109 2009-04-21 13:42:45 +0200 sb r271035 : removed obsolete psprint dependency 2009-04-21 10:33:31 +0200 sb r271024 : changes to previous -c270971 so that build does not break for USE_SHELL!=bash (but instead resulting bridgetest_xxx scripts are nonfunctional) 2009-04-21 08:56:48 +0200 sb r271017 : merged in cws/sb107 -c 268250 (avoid warnings about format specifier and argument mismatch (on 64bit debug builds)) 2009-04-20 16:42:27 +0200 sb r270995 : #i98625# add make_xxx functions for C++ representations of UNO polystructs; fixed and adapted tests (patch by thb, slightly adapted) 2009-04-20 14:23:45 +0200 sb r270981 : #i84751# selective performance improvements (patch by mmeeks, slightly adapted) 2009-04-20 13:39:50 +0200 sb r270978 : #i99711# removed dead code (patch by cmc, slightly modified) 2009-04-20 11:59:39 +0200 sb r270972 : #i97975# avoid crashes during shutdown (patch by cmc, slightly modified) 2009-04-20 11:57:52 +0200 sb r270971 : made tests work again after LD_LIBRARY_PATH clean up 2009-04-20 09:49:32 +0200 sb r270963 : #i95593# made tests work again after LD_LIBRARY_PATH cleanup 2009-04-17 13:52:33 +0200 sb r270941 : merged in cws/sb107 -c 270023 (added svn:ignore) 2009-04-15 13:46:24 +0200 sb r270841 : #i92131# dead code elimination (based on a patch by cmc) 2009-04-15 13:29:27 +0200 sb r270839 : #i100743# use a FastLess for the Data map (based on a patch my mmeeks) 2009-04-15 13:12:11 +0200 sb r270837 : #i100583# dead code elimination (patch by cmc) 2009-04-15 13:02:19 +0200 sb r270835 : avoid bogus Solaris C++ compiler warning when building with debug=x 2009-04-15 11:49:46 +0200 sb r270828 : adapted to cleared LD_LIBRARY_PATH 2009-04-15 10:49:48 +0200 sb r270826 : #i101101# for performance reasons, do not put ComponentContext in unsafe appartment 2009-04-15 10:08:20 +0200 sb r270824 : #i99113# removed duplicated stocservices.uno lib from basis layer --- codemaker/test/cppumaker/makefile.mk | 6 +++--- codemaker/test/cppumaker/test_codemaker_cppumaker.cxx | 16 ++++++++++++---- codemaker/test/cppumaker/types.idl | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) (limited to 'codemaker/test') diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk index db4227155f0a..bab3dcbb30ea 100644 --- a/codemaker/test/cppumaker/makefile.mk +++ b/codemaker/test/cppumaker/makefile.mk @@ -59,8 +59,8 @@ $(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag $(MISC)$/$(TARGET).cppumaker.flag: $(BIN)$/cppumaker$(EXECPOST) $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc - $(BIN)$/cppumaker$(EXECPOST) -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< \ - $(SOLARBINDIR)$/udkapi.rdb + $(AUGMENT_LIBRARY_PATH) $(BIN)$/cppumaker$(EXECPOST) \ + -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb $(TOUCH) $@ $(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd @@ -72,4 +72,4 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< test .PHONY: $(SHL1TARGETN) - testshl2 $< + $(AUGMENT_LIBRARY_PATH) testshl2 $< diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx index ba29d1822650..2f5c75fc1d92 100644 --- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx +++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx @@ -382,7 +382,7 @@ class Test: public CppUnit::TestFixture { public: void testBigStruct(); - void testPolyCharStruct(); + void testPolyStruct(); void testExceptions(); @@ -390,7 +390,7 @@ public: CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testBigStruct); - CPPUNIT_TEST(testPolyCharStruct); + CPPUNIT_TEST(testPolyStruct); CPPUNIT_TEST(testExceptions); CPPUNIT_TEST(testConstants); CPPUNIT_TEST_SUITE_END(); @@ -444,9 +444,13 @@ void Test::testBigStruct() { CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0)); CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0)); -#if defined __GNUC__ && __GNUC__ >= 3 +#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN CPPUNIT_ASSERT_EQUAL( +#if defined X86_64 + static_cast< std::size_t >(24), +#else static_cast< std::size_t >(16), +#endif sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct)); #endif @@ -464,7 +468,7 @@ void Test::testBigStruct() { CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_CHAR, std->aBase.ppTypeRefs[10]->eTypeClass); // char m11; } -void Test::testPolyCharStruct() { +void Test::testPolyStruct() { CPPUNIT_ASSERT_EQUAL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -472,6 +476,10 @@ void Test::testPolyCharStruct() { (com::sun::star::uno::makeAny( test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). getValueType().getTypeName())); + CPPUNIT_ASSERT_EQUAL( + (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0). + member1), + static_cast< sal_uInt32 >(5)); } namespace { diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl index 798d7e088ee0..e6de0e1c5379 100644 --- a/codemaker/test/cppumaker/types.idl +++ b/codemaker/test/cppumaker/types.idl @@ -28,8 +28,8 @@ * ************************************************************************/ -//TODO: Do not depend on types for which C++ header files are only generated -// later in the build process in offuh: +/*TODO: Do not depend on types for which C++ header files are only generated + later in the build process in offuh: */ #include "com/sun/star/lang/ClassNotFoundException.idl" #include "com/sun/star/lang/IllegalAccessException.idl" #include "com/sun/star/lang/Locale.idl" -- cgit