Include the rest of the active sal cppunit tests for iOS

8 files changed, 24 insertions, 27 deletions

diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 8412c681d00b..9683f20a7dde 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -43,8 +43,6 @@ CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Condition by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Condition.obj
 
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 58361fb66c3b..85d9beb44972 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -43,8 +43,6 @@ CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Security by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Security.obj
 
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 5ac7a7978f43..1a015da3bdfd 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -55,8 +55,7 @@ DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index 15639f26b23b..fd95355ac912 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -46,8 +46,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_cipher.obj
 
@@ -60,12 +58,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF2EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:joblist
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index c8682277075a..3820a8cf7422 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -44,8 +44,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_crc32.obj
 
@@ -58,12 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:jobfile
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 984cf1a68457..0d1c8f83fb46 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -44,8 +44,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:locale by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_locale.obj
 
@@ -58,13 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:locale
-# END ------------------------------------------------------------------
-
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/static/makefile.mk b/sal/qa/static/makefile.mk
index 0762e73378ce..71c308544ecf 100644
--- a/sal/qa/static/makefile.mk
+++ b/sal/qa/static/makefile.mk
@@ -54,7 +54,13 @@ APP1LIBS += \
     $(SLB)/qa_ostringbuffer.lib \
     $(SLB)/qa_osl_condition.lib \
     $(SLB)/qa_osl_file.lib \
-    $(SLB)/qa_osl_security.lib
+    $(SLB)/qa_osl_security.lib \
+    $(SLB)/qa_rtl_alloc.lib \
+    $(SLB)/qa_rtl_cipher.lib \
+    $(SLB)/qa_rtl_crc32.lib \
+    $(SLB)/qa_rtl_doublelock.lib \
+    $(SLB)/qa_rtl_locale.lib \
+    $(SLB)/qa_sal.lib
 
 APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 APP1TARGET = $(TARGET)
diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx
index b5fb89b49bf9..4c3d942c187f 100644
--- a/sal/qa/static/sal_cppunittester_all.cxx
+++ b/sal/qa/static/sal_cppunittester_all.cxx
@@ -119,7 +119,13 @@ extern "C" CppUnitTestPlugIn *cppunitTest_qa_ByteSequence(void),
            *cppunitTest_qa_osl_File(void),
            *cppunitTest_tcwf(void),
            *cppunitTest_osl_old_test_file(void),
-           *cppunitTest_qa_osl_security(void);
+           *cppunitTest_qa_osl_security(void),
+           *cppunitTest_qa_rtl_alloc(void),
+           *cppunitTest_qa_rtl_cipher(void),
+           *cppunitTest_qa_rtl_crc32(void),
+           *cppunitTest_qa_rtl_doublelock(void),
+           *cppunitTest_qa_rtl_locale(void),
+           *cppunitTest_qa_sal(void);
 
 SAL_IMPLEMENT_MAIN() {
     TestPlugInSignature plugs[] = {
@@ -130,6 +136,12 @@ SAL_IMPLEMENT_MAIN() {
         cppunitTest_tcwf,
         cppunitTest_osl_old_test_file,
         cppunitTest_qa_osl_security,
+        cppunitTest_qa_rtl_alloc,
+        cppunitTest_qa_rtl_cipher,
+        cppunitTest_qa_rtl_crc32,
+        cppunitTest_qa_rtl_doublelock,
+        cppunitTest_qa_rtl_locale,
+        cppunitTest_qa_sal,
         NULL
     };
     CppUnit::TestResult result;