diff options
| author | sb <sb@openoffice.org> | 2010-01-13 18:56:34 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-13 18:56:34 +0100 |
| commit | 6bcdfaf6a740250ac39d4fceb3f500b82cb96040 (patch) | |
| tree | 30116f6d9d837221b2121c9375a7be2559351379 /solenv/inc/cppunit.mk | |
| parent | e0d3cb8fa07a0f9786ae058802acee35faef0e4e (diff) | |
sb118: adapted cppunit.mk to cppunittester and no longer require "dmake test" to run tests; changed places back to include _cppunit.mk where it had been taken out before
Diffstat (limited to 'solenv/inc/cppunit.mk')
| -rw-r--r-- | solenv/inc/cppunit.mk | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index 6571d60d3ab0..7ba7e08a93ec 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -31,15 +31,12 @@ # Helper makefile additional, to support # dmake test -# for testshl2 (cppunit testing) +# for cppunittester (cppunit testing) # for simple start all generated libraries: # dmake test # # for library 1 & 2: # or dmake test1 test2 -# -# for library 2 with additional options to the testshl2 -# dmake test2 TESTOPT="-dntsf" # This file have to be unroll by # cat cppunit.mk | mkunroll >_cppunit.mk @@ -47,38 +44,17 @@ # $(TNR) is the number # $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib" -#.IF "$(TESTOPT)"=="" -# TESTOPT="-onlyerrors" -#.ENDIF - ################################################################################ # unroll begin # ---- create the test libraries ------------------------------------ -TEST$(TNR)LIB=$(SHL$(TNR)TARGETN) -.IF "$(TESTOPT)"=="" - TEST$(TNR)OPT="-jobexclude" - TEST$(TNR)OPT+=$(SHL$(TNR)TARGET).xsce - TEST$(TNR)OPT+="-sf" - TEST$(TNR)OPT+=$(mktmp "foo") - TEST$(TNR)OPT+="-onlyerrors" - TEST$(TNR)OPT+=" " - TEST$(TNR)OPT+=$(TESTOPTADD) -.ELSE - TEST$(TNR)OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL$(TNR)TARGET)"!="" -test : test$(TNR) -test$(TNR): ALLTAR +ALLTAR : test$(TNR) +test$(TNR) .PHONY : $(SHL$(TNR)TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#$(TNR) on library $(TEST$(TNR)LIB) + @echo - start unit test \#$(TNR) on library $(SHL$(TNR)TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST$(TNR)LIB) $(TEST$(TNR)OPT) -.ELSE - testshl2 $(TEST$(TNR)LIB) $(TEST$(TNR)OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL$(TNR)TARGETN) .ENDIF # unroll end |