openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1700929 [1/2] - in /openoffice/trunk/main/sal/qa/OStringBuffer: makefile.mk rtl_OStringBuffer.cxx
Date Thu, 03 Sep 2015 04:26:09 GMT
Author: damjan
Date: Thu Sep  3 04:26:09 2015
New Revision: 1700929

URL: http://svn.apache.org/r1700929
Log:
#i125003# migrate main/sal/qa/OStringBuffer from cppunit to Google Test.


Modified:
    openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk
    openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx

Modified: openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk?rev=1700929&r1=1700928&r2=1700929&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk Thu Sep  3 04:26:09 2015
@@ -36,39 +36,30 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+	@echo unit tests are disabled. Nothing to do.
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.ELSE
 
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES= \
-#	  $(SLO)$/OStringBuffer.obj
+CFLAGS+= $(LFS_CFLAGS)
+CXXFLAGS+= $(LFS_CFLAGS)
 
 #----------------------------------- OStringBuffer -----------------------------------
 
-SHL1OBJS= \
+APP1OBJS= \
 	$(SLO)$/rtl_OStringBuffer.obj \
 	$(SLO)$/rtl_String_Utils.obj
 
-SHL1TARGET= rtl_OStringBuffer
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-SHL1RPATH = NONE
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+APP1TARGET= rtl_OStringBuffer
+APP1STDLIBS= $(SALLIB) $(GTESTLIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
 
 .END



Mime
View raw message