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 | |
parent | sb118: fixed configure support for --with-package-format=msi (diff) | |
download | core-6bcdfaf6a740250ac39d4fceb3f500b82cb96040.tar.gz core-6bcdfaf6a740250ac39d4fceb3f500b82cb96040.zip |
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')
-rw-r--r-- | solenv/inc/_cppunit.mk | 250 | ||||
-rw-r--r-- | solenv/inc/cppunit.mk | 34 |
2 files changed, 45 insertions, 239 deletions
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk index 7aab2b0cdb13..8d9e45d33331 100644 --- a/solenv/inc/_cppunit.mk +++ b/solenv/inc/_cppunit.mk @@ -1,290 +1,120 @@ # unroll begin # ---- create the test libraries ------------------------------------ -TEST1LIB=$(SHL1TARGETN) -.IF "$(TESTOPT)"=="" - TEST1OPT="-jobexclude" - TEST1OPT+=$(SHL1TARGET).xsce - TEST1OPT+="-sf" - TEST1OPT+=$(mktmp "foo") - TEST1OPT+="-onlyerrors" - TEST1OPT+=" " - TEST1OPT+=$(TESTOPTADD) -.ELSE - TEST1OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL1TARGET)"!="" -test : test1 -test1: ALLTAR +ALLTAR : test1 +test1 .PHONY : $(SHL1TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#1 on library $(TEST1LIB) + @echo - start unit test \#1 on library $(SHL1TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST1LIB) $(TEST1OPT) -.ELSE - testshl2 $(TEST1LIB) $(TEST1OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL1TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST2LIB=$(SHL2TARGETN) -.IF "$(TESTOPT)"=="" - TEST2OPT="-jobexclude" - TEST2OPT+=$(SHL2TARGET).xsce - TEST2OPT+="-sf" - TEST2OPT+=$(mktmp "foo") - TEST2OPT+="-onlyerrors" - TEST2OPT+=" " - TEST2OPT+=$(TESTOPTADD) -.ELSE - TEST2OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL2TARGET)"!="" -test : test2 -test2: ALLTAR +ALLTAR : test2 +test2 .PHONY : $(SHL2TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#2 on library $(TEST2LIB) + @echo - start unit test \#2 on library $(SHL2TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST2LIB) $(TEST2OPT) -.ELSE - testshl2 $(TEST2LIB) $(TEST2OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL2TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST3LIB=$(SHL3TARGETN) -.IF "$(TESTOPT)"=="" - TEST3OPT="-jobexclude" - TEST3OPT+=$(SHL3TARGET).xsce - TEST3OPT+="-sf" - TEST3OPT+=$(mktmp "foo") - TEST3OPT+="-onlyerrors" - TEST3OPT+=" " - TEST3OPT+=$(TESTOPTADD) -.ELSE - TEST3OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL3TARGET)"!="" -test : test3 -test3: ALLTAR +ALLTAR : test3 +test3 .PHONY : $(SHL3TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#3 on library $(TEST3LIB) + @echo - start unit test \#3 on library $(SHL3TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST3LIB) $(TEST3OPT) -.ELSE - testshl2 $(TEST3LIB) $(TEST3OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL3TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST4LIB=$(SHL4TARGETN) -.IF "$(TESTOPT)"=="" - TEST4OPT="-jobexclude" - TEST4OPT+=$(SHL4TARGET).xsce - TEST4OPT+="-sf" - TEST4OPT+=$(mktmp "foo") - TEST4OPT+="-onlyerrors" - TEST4OPT+=" " - TEST4OPT+=$(TESTOPTADD) -.ELSE - TEST4OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL4TARGET)"!="" -test : test4 -test4: ALLTAR +ALLTAR : test4 +test4 .PHONY : $(SHL4TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#4 on library $(TEST4LIB) + @echo - start unit test \#4 on library $(SHL4TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST4LIB) $(TEST4OPT) -.ELSE - testshl2 $(TEST4LIB) $(TEST4OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL4TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST5LIB=$(SHL5TARGETN) -.IF "$(TESTOPT)"=="" - TEST5OPT="-jobexclude" - TEST5OPT+=$(SHL5TARGET).xsce - TEST5OPT+="-sf" - TEST5OPT+=$(mktmp "foo") - TEST5OPT+="-onlyerrors" - TEST5OPT+=" " - TEST5OPT+=$(TESTOPTADD) -.ELSE - TEST5OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL5TARGET)"!="" -test : test5 -test5: ALLTAR +ALLTAR : test5 +test5 .PHONY : $(SHL5TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#5 on library $(TEST5LIB) + @echo - start unit test \#5 on library $(SHL5TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST5LIB) $(TEST5OPT) -.ELSE - testshl2 $(TEST5LIB) $(TEST5OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL5TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST6LIB=$(SHL6TARGETN) -.IF "$(TESTOPT)"=="" - TEST6OPT="-jobexclude" - TEST6OPT+=$(SHL6TARGET).xsce - TEST6OPT+="-sf" - TEST6OPT+=$(mktmp "foo") - TEST6OPT+="-onlyerrors" - TEST6OPT+=" " - TEST6OPT+=$(TESTOPTADD) -.ELSE - TEST6OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL6TARGET)"!="" -test : test6 -test6: ALLTAR +ALLTAR : test6 +test6 .PHONY : $(SHL6TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#6 on library $(TEST6LIB) + @echo - start unit test \#6 on library $(SHL6TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST6LIB) $(TEST6OPT) -.ELSE - testshl2 $(TEST6LIB) $(TEST6OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL6TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST7LIB=$(SHL7TARGETN) -.IF "$(TESTOPT)"=="" - TEST7OPT="-jobexclude" - TEST7OPT+=$(SHL7TARGET).xsce - TEST7OPT+="-sf" - TEST7OPT+=$(mktmp "foo") - TEST7OPT+="-onlyerrors" - TEST7OPT+=" " - TEST7OPT+=$(TESTOPTADD) -.ELSE - TEST7OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL7TARGET)"!="" -test : test7 -test7: ALLTAR +ALLTAR : test7 +test7 .PHONY : $(SHL7TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#7 on library $(TEST7LIB) + @echo - start unit test \#7 on library $(SHL7TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST7LIB) $(TEST7OPT) -.ELSE - testshl2 $(TEST7LIB) $(TEST7OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL7TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST8LIB=$(SHL8TARGETN) -.IF "$(TESTOPT)"=="" - TEST8OPT="-jobexclude" - TEST8OPT+=$(SHL8TARGET).xsce - TEST8OPT+="-sf" - TEST8OPT+=$(mktmp "foo") - TEST8OPT+="-onlyerrors" - TEST8OPT+=" " - TEST8OPT+=$(TESTOPTADD) -.ELSE - TEST8OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL8TARGET)"!="" -test : test8 -test8: ALLTAR +ALLTAR : test8 +test8 .PHONY : $(SHL8TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#8 on library $(TEST8LIB) + @echo - start unit test \#8 on library $(SHL8TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST8LIB) $(TEST8OPT) -.ELSE - testshl2 $(TEST8LIB) $(TEST8OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL8TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST9LIB=$(SHL9TARGETN) -.IF "$(TESTOPT)"=="" - TEST9OPT="-jobexclude" - TEST9OPT+=$(SHL9TARGET).xsce - TEST9OPT+="-sf" - TEST9OPT+=$(mktmp "foo") - TEST9OPT+="-onlyerrors" - TEST9OPT+=" " - TEST9OPT+=$(TESTOPTADD) -.ELSE - TEST9OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL9TARGET)"!="" -test : test9 -test9: ALLTAR +ALLTAR : test9 +test9 .PHONY : $(SHL9TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#9 on library $(TEST9LIB) + @echo - start unit test \#9 on library $(SHL9TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST9LIB) $(TEST9OPT) -.ELSE - testshl2 $(TEST9LIB) $(TEST9OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL9TARGETN) .ENDIF # unroll begin # ---- create the test libraries ------------------------------------ -TEST10LIB=$(SHL10TARGETN) -.IF "$(TESTOPT)"=="" - TEST10OPT="-jobexclude" - TEST10OPT+=$(SHL10TARGET).xsce - TEST10OPT+="-sf" - TEST10OPT+=$(mktmp "foo") - TEST10OPT+="-onlyerrors" - TEST10OPT+=" " - TEST10OPT+=$(TESTOPTADD) -.ELSE - TEST10OPT=$(TESTOPT) -.ENDIF - .IF "$(SHL10TARGET)"!="" -test : test10 -test10: ALLTAR +ALLTAR : test10 +test10 .PHONY : $(SHL10TARGETN) @echo ---------------------------------------------------------- - @echo - start unit test \#10 on library $(TEST10LIB) + @echo - start unit test \#10 on library $(SHL10TARGETN) @echo ---------------------------------------------------------- -.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: - `which testshl2` $(TEST10LIB) $(TEST10OPT) -.ELSE - testshl2 $(TEST10LIB) $(TEST10OPT) -.ENDIF + $(CPPUNITTESTER) $(SHL10TARGETN) .ENDIF 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 |