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 | e6fd0d7630e8cb0f834166ee6cc6fbb871482b51 (patch) | |
tree | 5d5b62c3a9c26db360ef9c1eafbdd7421a5202f1 | |
parent | ec0f00417aaabc0676757e310b99d3202667a37c (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
-rw-r--r-- | basebmp/test/makefile.mk | 9 | ||||
-rw-r--r-- | basegfx/test/makefile.mk | 12 | ||||
-rw-r--r-- | o3tl/qa/makefile.mk | 8 |
3 files changed, 3 insertions, 26 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 36b540231188..82eacd4ebbd6 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -123,12 +123,5 @@ SLOFILES=$(SHL1OBJS) # --- Enable test execution in normal build ------------------------ .IF "$(L10N_framework)"=="" - -unittest : $(SHL1TARGETN) - @echo ---------------------------------------------------------- - @echo - start unit test on library $(SHL1TARGETN) - @echo ---------------------------------------------------------- - $(CPPUNITTESTER) $(SHL1TARGETN) - -ALLTAR : unittest +.INCLUDE : _cppunit.mk .ENDIF diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index be6e537ba25a..60a7706450ab 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -71,14 +71,4 @@ SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk - -# --- Enable testshl2 execution in normal build ------------------------ - -$(MISC)$/unittest_succeeded : $(SHL1TARGETN) - @echo ---------------------------------------------------------- - @echo - start unit test on library $(SHL1TARGETN) - @echo ---------------------------------------------------------- - $(CPPUNITTESTER) $(SHL1TARGETN) - $(TOUCH) $@ - -ALLTAR : $(MISC)$/unittest_succeeded +.INCLUDE : _cppunit.mk diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index 491c50ec2095..df90c0f3fa23 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -72,12 +72,6 @@ SLOFILES=$(SHL1OBJS) # --- Enable test execution in normal build ------------------------ .IF "$(L10N_framework)"=="" -unittest : $(SHL1TARGETN) - @echo ---------------------------------------------------------- - @echo - start unit test on library $(SHL1TARGETN) - @echo ---------------------------------------------------------- - $(CPPUNITTESTER) $(SHL1TARGETN) - -ALLTAR : unittest +.INCLUDE : _cppunit.mk .ENDIF # L10N_framework |