summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-14 19:06:55 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-14 19:06:55 +0200
commit6152b5efa3490cc8f09f269dc7542ffe3833358c (patch)
tree7e794e9277c987095cee259f58aa41504914be5f
parent0cb550725d7e128e72e67739aff5338865c28abc (diff)
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
-rw-r--r--basebmp/test/basictest.cxx2
-rw-r--r--basebmp/test/bmpmasktest.cxx2
-rw-r--r--basebmp/test/bmptest.cxx2
-rw-r--r--basebmp/test/cliptest.cxx2
-rw-r--r--basebmp/test/filltest.cxx2
-rw-r--r--basebmp/test/linetest.cxx2
-rw-r--r--basebmp/test/makefile.mk17
-rw-r--r--basebmp/test/masktest.cxx2
-rw-r--r--basebmp/test/polytest.cxx2
-rw-r--r--basegfx/test/basegfx1d.cxx2
-rw-r--r--basegfx/test/basegfx2d.cxx2
-rw-r--r--basegfx/test/basegfx3d.cxx2
-rw-r--r--basegfx/test/makefile.mk11
-rw-r--r--comphelper/qa/makefile.mk6
-rw-r--r--comphelper/qa/test_string.cxx2
-rw-r--r--comphelper/qa/test_weakbag.cxx2
-rw-r--r--o3tl/qa/makefile.mk3
-rw-r--r--o3tl/qa/test-cow_wrapper.cxx2
-rw-r--r--o3tl/qa/test-heap_ptr.cxx2
-rw-r--r--o3tl/qa/test-range.cxx2
-rw-r--r--svtools/qa/makefile.mk19
-rw-r--r--svtools/qa/test_URIHelper.cxx2
-rw-r--r--tools/qa/makefile.mk4
-rw-r--r--tools/qa/test_pathutils.cxx2
-rw-r--r--tools/test/makefile.mk9
-rw-r--r--tools/test/tests.cxx2
26 files changed, 56 insertions, 51 deletions
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 15d2da39851a..d4d836a4b553 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index afadcad3b3fb..1b9e4ca0c68f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 33ed58c25402..978c4bbe6243 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 2172b0b667a7..41da8cac617a 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index fcc4e5df5fa3..ba25cfa9044e 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 1a424864f893..b78175128eba 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 7d0dc6e3967a..4e3384b935a6 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ CFLAGS += -fno-inline
# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS"
# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
.IF "$(CCNUMVER)"!="00050005"
CDEFS+=-xalias_level=compatible
@@ -67,7 +67,7 @@ CDEFS+=-xalias_level=compatible
# --- Common ----------------------------------------------------------
# BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl
+# auto generated Target:tests by codegen.pl
SHL1OBJS= \
$(SLO)$/basictest.obj \
$(SLO)$/bmpmasktest.obj \
@@ -88,13 +88,14 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB) \
- $(BASEGFXLIB)
+ $(BASEGFXLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
# END ------------------------------------------------------------------
@@ -111,7 +112,7 @@ SHL1VERSIONMAP = export.map
# $(CPPUHELPERLIB) \
# $(UCBHELPERLIB) \
# $(SALLIB) \
-# $(VCLLIB)
+# $(VCLLIB)
#
#.IF "$(GUI)"!="UNX"
#APP2DEF= $(MISC)$/$(TARGET).def
@@ -119,12 +120,12 @@ SHL1VERSIONMAP = export.map
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 61f329f094f2..94e5bc42a5ea 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index e35c8c834bd9..da118e4b6d8a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index f058b0034fa7..454ed23289b2 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx1d
{
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 8b732e465a51..8f3e340729a2 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index fc59ffbced4e..f0fe463ce23d 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx3d
{
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 8e47a13defdd..d21093f4e08a 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ SHL1OBJS= \
$(SLO)$/basegfx1d.obj \
$(SLO)$/basegfx2d.obj \
$(SLO)$/basegfx3d.obj \
- $(SLO)$/testtools.obj
+ $(SLO)$/testtools.obj
# linking statically against basegfx parts
SHL1LIBS=\
@@ -65,23 +65,24 @@ SHL1STDLIBS= \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
+ $(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable testshl2 execution in normal build ------------------------
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index cfc597570bc4..52c57a9d77de 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_weakbag
SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -55,4 +55,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL1TARGETN)
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index 035e56fdb8c4..c237158beccc 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.cxx
@@ -32,7 +32,7 @@
#include "sal/config.h"
#include "comphelper/string.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index dd4a8356eb5a..470ac2eef6c0 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.cxx
@@ -35,7 +35,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "comphelper/weakbag.hxx"
#include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
namespace {
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index a6ebfbba4bb9..53806c153d13 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -51,6 +51,7 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index 6bb169e951a4..eebbb633f82b 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -1,6 +1,6 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include "cow_wrapper_clients.hxx"
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index 5e247a8b9abc..25f2209c94f5 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.cxx
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <o3tl/heap_ptr.hxx>
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index 626d9b6e3a90..fa956db96005 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -29,7 +29,7 @@
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <o3tl/range.hxx>
#include <vector>
diff --git a/svtools/qa/makefile.mk b/svtools/qa/makefile.mk
index cbb59a0d10ac..c56dc2804a64 100644
--- a/svtools/qa/makefile.mk
+++ b/svtools/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ ENABLE_EXCEPTIONS = true
.INCLUDE : settings.mk
# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
+# auto generated Target:job by codegen.pl
SHL1OBJS= \
$(SLO)$/test_URIHelper.obj
@@ -52,7 +52,8 @@ SHL1STDLIBS=\
$(SVTOOLLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
- $(CPPUNITLIB)
+ $(TESTSHL2LIB) \
+ $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
@@ -71,15 +72,15 @@ SHL1VERSIONMAP= export.map
# LLA: old stuff
# USE_DEFFILE = true
-#
+#
# .INCLUDE: settings.mk
-#
+#
# .IF "$(OS)" == "WNT"
# REGEXP = "s/^[\#].*$$//"
# .ELSE # OS, WNT
# REGEXP = 's/^[\#].*$$//'
# .ENDIF # OS, WNT
-#
+#
# SHL1TARGET = URIHelper
# SHL1OBJS = \
# $(SLO)$/test_URIHelper.obj
@@ -90,12 +91,12 @@ SHL1VERSIONMAP= export.map
# $(SVTOOLLIB) \
# $(TOOLSLIB) \
# $(UNOTOOLSLIB)
-#
+#
# DEF1NAME = $(SHL1TARGET)
# DEF1EXPORTFILE = $(MISC)$/$(SHL1TARGET).dxp
-#
+#
# .INCLUDE: target.mk
-#
+#
# $(MISC)$/$(SHL1TARGET).dxp: sce$/$(SHL1TARGET).sce
# + $(TYPE) $< | sed $(REGEXP) > $@
# + $(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
diff --git a/svtools/qa/test_URIHelper.cxx b/svtools/qa/test_URIHelper.cxx
index d60780132903..a90fbe039b6d 100644
--- a/svtools/qa/test_URIHelper.cxx
+++ b/svtools/qa/test_URIHelper.cxx
@@ -57,7 +57,7 @@
#include "cppuhelper/bootstrap.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase2.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "osl/diagnose.h"
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index 15f9c6a9fdaf..c63aa966b7fc 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -40,7 +40,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = test_pathutils
SHL1OBJS = $(SLO)$/test_pathutils.obj $(SLO)$/pathutils.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -52,4 +52,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
+ $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 9cd4e2110937..c028a2f654c4 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -33,7 +33,7 @@
#include <cwchar>
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "tools/pathutils.hxx"
namespace {
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
index 63108677829c..22796f47d72f 100644
--- a/tools/test/makefile.mk
+++ b/tools/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -48,19 +48,20 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
$(TOOLSLIB) \
+ $(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
#------------------------------- All object files ----------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index 913bd444f145..a2bfb63d4c5f 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.cxx
@@ -33,7 +33,7 @@
#include "precompiled_tools.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <rtl/math.hxx>
#include <tools/fract.hxx>