summaryrefslogtreecommitdiff
path: root/basebmp/test/makefile.mk
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2009-12-11 14:29:59 +0100
committersb <sb@openoffice.org>2009-12-11 14:29:59 +0100
commit18be96dc73c64d16f63fc6d3382d7d7d3a8fee24 (patch)
tree994abb78470fddf977f267d7d1f5ad4c6b489c2e /basebmp/test/makefile.mk
parentf8ada8f2a93659e27928f3b5244c813de2c3847b (diff)
sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified) latest 1.12.1.
- Old modifications were necessary for testshl2, which has simply been excluded from the build for now. - Tests in basebmp, basegfx, o3tl (that are executed during build) have been converted from using modified CppUnit/testshl2 to using unmodified CppUnit. - CppUnit's DllPlugInTester has problems with OOo tests on Windows, see #i107562#, so for now a new cppunittester from sal is used instead.
Diffstat (limited to 'basebmp/test/makefile.mk')
-rw-r--r--basebmp/test/makefile.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 3ea13868aeb4..7061a77a8e09 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -124,7 +124,6 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
@@ -133,7 +132,7 @@ unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
- $(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
+ $(CPPUNITTESTER) $(SHL1TARGETN)
ALLTAR : unittest
.ENDIF