From 6ab96ee3d57f1bdf79f58f02a1f2a455f72f3a5a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 10 Jul 2011 14:43:03 +0300 Subject: Do build sal unit tests for iOS, too We can't run them in the normal way, but we build the tests as static archives, which we link into the single sal_cppunittester_all executable. (Work in progress, so far just a part of the tests are linked into it.) There is no makefilery yet to actually construct a complete iOS app bundle (.app directory), so just copy (in this case) the sal_cppunittester_all iOS executable on top of the executbale some dummy iOS app you build in Xcode... works fine, can be debugged that way. --- sal/qa/rtl/alloc/makefile.mk | 6 +++--- sal/qa/rtl/cipher/makefile.mk | 6 +++--- sal/qa/rtl/crc32/makefile.mk | 6 +++--- sal/qa/rtl/doublelock/makefile.mk | 6 +++--- sal/qa/rtl/locale/makefile.mk | 6 +++--- sal/qa/rtl/oustringbuffer/makefile.mk | 6 +++--- sal/qa/rtl/strings/makefile.mk | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'sal/qa/rtl') diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk index d829b14643c8..5ac7a7978f43 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 30fc67825a0c..15639f26b23b 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 23e7fd2aa724..c8682277075a 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 87ef35bcbc88..214d8cb58407 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 fd97147937a6..984cf1a68457 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 32583c2ff25a..0db90281a929 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 821e04e7fea8..c58476e5918f 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 -- cgit