diff options
26 files changed, 92 insertions, 73 deletions
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk index cb566aeb1..2ec11e16f 100644 --- a/sal/osl/unx/makefile.mk +++ b/sal/osl/unx/makefile.mk @@ -49,6 +49,10 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) +.IF "$(OS)" == "IOS" +CFLAGSCXX+=-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 +.ENDIF + # --- Files -------------------------------------------------------- SLOFILES= \ @@ -113,7 +117,7 @@ OBJFILES= $(OBJ)$/conditn.obj \ $(OBJ)$/readwrite_helper.obj -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS" SLOFILES += $(SLO)$/osxlocale.obj .ENDIF diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk index 60d87c83f..cc2d79dbf 100644 --- a/sal/qa/ByteSequence/makefile.mk +++ b/sal/qa/ByteSequence/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGSCXX += $(CPPUNIT_CFLAGS) -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLO)/ByteSequence.obj @@ -47,7 +49,5 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk index e6419b72b..4149c5848 100644 --- a/sal/qa/OStringBuffer/makefile.mk +++ b/sal/qa/OStringBuffer/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -63,8 +65,6 @@ SHL1RPATH = NONE # do this here, so we get right dependencies SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk index e9eec4d98..391ac66b8 100644 --- a/sal/qa/makefile.mk +++ b/sal/qa/makefile.mk @@ -47,8 +47,6 @@ TARGET=whole_sal_qa ALLTAR : test_all .ENDIF -.IF "$(CROSS_COMPILING)"!="YES" - # OTHER STUFF ------------------------------------------------------ # test : test_all @@ -62,5 +60,3 @@ test_all: @echo - start sal unit tests @echo ---------------------------------------------------------- $(PERL) buildall.pl $(TESTOPT) - -.ENDIF diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index 89a4fb363..8412c681d 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -53,10 +55,8 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP = $(PRJ)$/qa$/export.map -# auto generated Target:Condition -# END ------------------------------------------------------------------ - -.ENDIF +# ------------------------------------------------------------------ +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index 4cb2ffebc..de85e5e5e 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -36,8 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -79,9 +77,7 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 6a25539cd..e4acd654d 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File +#endif + //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 80e9e077b..e18649055 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file +#endif + // LLA: // this file is converted to use with testshl2 // original was placed in sal/test/textenc.cxx diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 891163120..56135301e 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf +#endif + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -43,7 +47,7 @@ using ::rtl::OUStringToOString; using ::rtl::OString; //Use to silence OSL_ warnings for a deliberate error -extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * ) +extern "C" void SAL_CALL suppressOslDebugMessage2( const sal_Char *, sal_Int32, const sal_Char * ) { } @@ -71,7 +75,7 @@ public: //deliberate errors, suppress run-time warning for operations on //un-opened File pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc = - osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage ); + osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage2 ); char buffer[1]; sal_uInt64 written = 0; diff --git a/sal/qa/osl/getsystempathfromfileurl/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk index 769313aad..71597ba07 100644 --- a/sal/qa/osl/getsystempathfromfileurl/makefile.mk +++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk @@ -37,7 +37,9 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -53,8 +55,6 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: _cppunit.mk diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index 22a4811ea..7fdf0ca43 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -72,9 +74,8 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME =$(SHL2TARGET) SHL2VERSIONMAP= $(PRJ)$/qa$/export.map -# END ------------------------------------------------------------------ -.ENDIF +SLOFILES = $(SHL2OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 983cfe7e9..42fdc7932 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -190,6 +190,8 @@ namespace osl_Module ::osl::Module aMod; bRes = aMod.is(); + printf ("Here we are\n"); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor without parameter.", sal_False == bRes ); } diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index 17bac5faf..cf78cd5f5 100644 --- a/sal/qa/osl/process/makefile.mk +++ b/sal/qa/osl/process/makefile.mk @@ -35,8 +35,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -79,8 +77,6 @@ SHL2DEPN=$(APP3TARGETN) \ SLOFILES=$(SHL1OBJS) $(SHL2OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 0def479d9..de0589f45 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread +#endif + #ifdef WNT #define NOMINMAX #include <windows.h> diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 9fb80a6fe..3a347839d 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process +#endif + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk index e6fbed4ab..58361fb66 100755 --- a/sal/qa/osl/security/makefile.mk +++ b/sal/qa/osl/security/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -57,10 +59,8 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP= $(PRJ)$/qa$/export.map -# auto generated Target:Security -# END ------------------------------------------------------------------ -.ENDIF +SLOFILES = $(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index faa009750..230b27e96 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -126,12 +126,12 @@ namespace osl_Security CPPUNIT_TEST_SUITE( logonUser ); - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd are forwarded { CPPUNIT_TEST( logonUser_user_pwd ); } - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) != aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) != aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd and file server are forwarded { CPPUNIT_TEST( logonUser_user_pwd_server ); @@ -587,31 +587,31 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, t_print("#\n#Retrived system information is below:\n"); t_print("Computer Name: "); - if ( strComputerName == aNullURL ) + if ( strComputerName == aNullUrl ) t_print("Not retrived\n" ); else printUString( strComputerName ); t_print("Current User Name: "); - if ( strUserName == aNullURL ) + if ( strUserName == aNullUrl ) t_print("Not retrived\n" ); else printUString( strUserName ); t_print("Current User Home Directory:"); - if ( strHomeDirectory == aNullURL ) + if ( strHomeDirectory == aNullUrl ) t_print("Not retrived\n" ); else printUString( strHomeDirectory ); t_print("Current Config Directory: "); - if ( strConfigDirectory == aNullURL ) + if ( strConfigDirectory == aNullUrl ) t_print("Not retrived\n" ); else printUString( strConfigDirectory ); t_print("Current UserID: "); - if ( strUserID == aNullURL ) + if ( strUserID == aNullUrl ) t_print("Not retrived\n" ); else printUString( strUserID ); @@ -624,7 +624,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, /// get and display forwarded text if available. aStringForward = ::rtl::OUString::createFromAscii( parameters.getCommandLine().c_str() ); - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 ) { sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' );; sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' ' );; diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 9298324a5..197745f7d 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -63,11 +63,15 @@ const char pTestString[17] = "Sun Microsystems"; //------------------------------------------------------------------------ // condition names //------------------------------------------------------------------------ -OSLTEST_DECLARE_USTRING( NullURL, "" ); -::rtl::OUString aLogonUser( aNullURL ), aLogonPasswd( aNullURL ), aFileServer( aNullURL ), aStringForward( aNullURL ); -::rtl::OUString strUserName( aNullURL ) , strComputerName( aNullURL ) , strHomeDirectory( aNullURL ); -::rtl::OUString strConfigDirectory( aNullURL ), strUserID( aNullURL ); +// Intentionally different from the aNullURL in osl_File_Const.h to avoid +// duplicate symbols as all the unit tests here get linked together for iOS... + +OSLTEST_DECLARE_USTRING( NullUrl, "" ); + +::rtl::OUString aLogonUser( aNullUrl ), aLogonPasswd( aNullUrl ), aFileServer( aNullUrl ), aStringForward( aNullUrl ); +::rtl::OUString strUserName( aNullUrl ) , strComputerName( aNullUrl ) , strHomeDirectory( aNullUrl ); +::rtl::OUString strConfigDirectory( aNullUrl ), strUserID( aNullUrl ); sal_Bool isAdmin = sal_False; diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk index d829b1464..5ac7a7978 100755 --- a/sal/qa/rtl/alloc/makefile.mk +++ b/sal/qa/rtl/alloc/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -56,8 +58,6 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # do this here, so we get right dependencies # SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk index 30fc67825..15639f26b 100644 --- a/sal/qa/rtl/cipher/makefile.mk +++ b/sal/qa/rtl/cipher/makefile.mk @@ -37,7 +37,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -65,8 +67,6 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # do this here, so we get right dependencies # SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk index 23e7fd2aa..c86822770 100755 --- a/sal/qa/rtl/crc32/makefile.mk +++ b/sal/qa/rtl/crc32/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -63,8 +65,6 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # do this here, so we get right dependencies # SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk index 87ef35bcb..214d8cb58 100644 --- a/sal/qa/rtl/doublelock/makefile.mk +++ b/sal/qa/rtl/doublelock/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -66,8 +68,6 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk index fd9714793..984cf1a68 100644 --- a/sal/qa/rtl/locale/makefile.mk +++ b/sal/qa/rtl/locale/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -64,8 +66,6 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # do this here, so we get right dependencies # SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk index 32583c2ff..0db90281a 100644 --- a/sal/qa/rtl/oustringbuffer/makefile.mk +++ b/sal/qa/rtl/oustringbuffer/makefile.mk @@ -34,7 +34,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -51,7 +53,5 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) SHL1VERSIONMAP := $(PRJ)$/qa$/export.map DEF1NAME := $(SHL1TARGET) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk index 821e04e7f..c58476e59 100644 --- a/sal/qa/rtl/strings/makefile.mk +++ b/sal/qa/rtl/strings/makefile.mk @@ -34,7 +34,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -52,7 +54,5 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) SHL1VERSIONMAP := $(PRJ)$/qa$/export.map DEF1NAME := $(SHL1TARGET) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk index 78c8646c3..0677acc24 100644 --- a/sal/qa/sal/makefile.mk +++ b/sal/qa/sal/makefile.mk @@ -33,7 +33,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF SHL1TARGET = $(TARGET)_types SHL1OBJS = $(SLO)$/test_types.obj @@ -44,7 +46,5 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk |