Author: damjan
Date: Sat Sep 5 19:30:51 2015
New Revision: 1701419
URL: http://svn.apache.org/r1701419
Log:
#i125003# migrate main/sal/qa/osl/file from cppunit to Google Test,
get tests to compile, but not all of them pass.
Modified:
openoffice/trunk/main/sal/qa/osl/file/makefile.mk
openoffice/trunk/main/sal/qa/osl/file/osl_File.cxx
openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h
openoffice/trunk/main/sal/qa/osl/file/osl_old_test_file.cxx
openoffice/trunk/main/sal/qa/osl/file/test_cpy_wrt_file.cxx
Modified: openoffice/trunk/main/sal/qa/osl/file/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/file/makefile.mk?rev=1701419&r1=1701418&r2=1701419&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/file/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/osl/file/makefile.mk Sat Sep 5 19:30:51 2015
@@ -32,50 +32,42 @@ 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)
# --- BEGIN --------------------------------------------------------
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/osl_File.obj
-SHL1TARGET= osl_File
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-
+APP1TARGET= osl_File
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
#-------------------------------------------------------------------
-SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj
-SHL2TARGET=tcwf
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL2IMPLIB=i$(SHL2TARGET)
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-DEF2NAME =$(SHL2TARGET)
-
-
+APP2OBJS=$(SLO)$/test_cpy_wrt_file.obj
+APP2TARGET=tcwf
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
# END --------------------------------------------------------------
# --- BEGIN --------------------------------------------------------
-SHL3OBJS= \
+APP3OBJS= \
$(SLO)$/osl_old_test_file.obj
-SHL3TARGET= osl_old_test_file
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL3IMPLIB= i$(SHL3TARGET)
-
-DEF3NAME =$(SHL3TARGET)
-SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+APP3TARGET= osl_old_test_file
+APP3STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP3RPATH = NONE
+APP3TEST = 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"
