Author: damjan
Date: Tue Sep 1 16:48:24 2015
New Revision: 1700615
URL: http://svn.apache.org/r1700615
Log:
#i125003# migrate main/sal/qa/rtl/textenc from cppunit to Google Test. Some
tests fail,
but they don't run during the build, and there is no way they passed with
cppunit either.
Modified:
openoffice/trunk/main/sal/qa/rtl/textenc/makefile.mk
openoffice/trunk/main/sal/qa/rtl/textenc/rtl_tencinfo.cxx
openoffice/trunk/main/sal/qa/rtl/textenc/rtl_textcvt.cxx
Modified: openoffice/trunk/main/sal/qa/rtl/textenc/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/textenc/makefile.mk?rev=1700615&r1=1700614&r2=1700615&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/textenc/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/rtl/textenc/makefile.mk Tue Sep 1 16:48:24
2015
@@ -32,40 +32,38 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
# --- BEGIN --------------------------------------------------------
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_textcvt.obj
-SHL1TARGET= rtl_textcvt
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+APP1TARGET= rtl_textcvt
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
# END --------------------------------------------------------------
# --- BEGIN --------------------------------------------------------
-SHL2OBJS= \
+APP2OBJS= \
$(SLO)$/rtl_tencinfo.obj
-SHL2TARGET= rtl_tencinfo
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME =$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+APP2TARGET= rtl_tencinfo
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
# END --------------------------------------------------------------
-#------------------------------- All object files
-------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
