Kaydet (Commit) 201e6e9f authored tarafından Damjan Jovanovic's avatar Damjan Jovanovic

#i125003# migrate main/sal/qa/osl/security from cppunit to Google Test.

üst f2e9a481
...@@ -32,29 +32,33 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -32,29 +32,33 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(ENABLE_UNIT_TESTS)" != "YES"
all:
@echo unit tests are disabled. Nothing to do.
.ELSE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:Security by codegen.pl # auto generated Target:Security by codegen.pl
SHL1OBJS= \ APP1OBJS= \
$(SLO)$/osl_Security.obj $(SLO)$/osl_Security.obj
SHL1TARGET= osl_Security APP1TARGET= osl_Security
SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
SHL1STDLIBS+= $(ADVAPI32LIB) APP1STDLIBS+= $(ADVAPI32LIB)
.ENDIF .ENDIF
SHL1IMPLIB= i$(SHL1TARGET) APP1RPATH = NONE
SHL1DEF= $(MISC)$/$(SHL1TARGET).def APP1TEST = enabled
DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# auto generated Target:Security # auto generated Target:Security
# END ------------------------------------------------------------------ # END ------------------------------------------------------------------
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
.INCLUDE : _cppunit.mk
.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
\ No newline at end of file
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <pwd.h> #include <pwd.h>
#endif #endif
#include <testshl/simpleheader.hxx> #include "gtest/gtest.h"
// LLA: #include <testshl2/cmdlinebits.hxx> // LLA: #include <testshl2/cmdlinebits.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment