summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2011-11-24 15:21:24 +0000
committerPedro Giffuni <pfg@apache.org>2011-11-24 15:21:24 +0000
commitfcd3ba7227013f6993f324395377a84a60ddbf28 (patch)
tree8855b0c393563a02fb674ececd2f3becda260d33 /test
parent70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (diff)
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Diffstat (limited to 'test')
-rw-r--r--test/prj/build.lst2
-rw-r--r--test/source/cpp/makefile.mk13
-rw-r--r--test/source/cpp/unoexceptionprotector/makefile.mk13
3 files changed, 27 insertions, 1 deletions
diff --git a/test/prj/build.lst b/test/prj/build.lst
index e22199a5c437..4f1b04172cc0 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,4 +1,4 @@
-te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv stlport unoil NULL
+te test : BOOST:boost cppu cppuhelper javaunohelper offuh ridljar sal solenv stlport unoil NULL
te test\inc nmake - all inc NULL
te test\source\cpp nmake - all source_cpp inc NULL
te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 2073f1500c07..bdb2938a7a89 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+ @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -58,4 +69,6 @@ SHL1TARGET = test
SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
+.ENDIF
+
.INCLUDE: target.mk
diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk
index 7f62199f46dc..8e600df09e2c 100644
--- a/test/source/cpp/unoexceptionprotector/makefile.mk
+++ b/test/source/cpp/unoexceptionprotector/makefile.mk
@@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+ @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
DLLPRE =
CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -54,3 +65,5 @@ SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
+
+.ENDIF