summaryrefslogtreecommitdiff
path: root/editeng/qa
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-21 12:29:05 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-21 12:29:05 +0100
commit41aed87d074878c3a38a7f982f5c2aaad9400189 (patch)
tree6c72f1355878c7f90b74dfda78a046e1d1e9c796 /editeng/qa
parent258e41160bcb8f397b360bbd6329b7037fd1b3ba (diff)
editeng: Adapted borderline unit test to new build system
Diffstat (limited to 'editeng/qa')
-rw-r--r--editeng/qa/items/borderline_test.cxx1
-rw-r--r--editeng/qa/items/makefile.mk94
-rw-r--r--editeng/qa/items/version.map34
3 files changed, 1 insertions, 128 deletions
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 870a6a740173..995ccef56d31 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -32,6 +32,7 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <editeng/borderline.hxx>
+#include <sal/cppunit.h>
#define TEST_WIDTH long( 40 )
diff --git a/editeng/qa/items/makefile.mk b/editeng/qa/items/makefile.mk
deleted file mode 100644
index 3d6b16eda57c..000000000000
--- a/editeng/qa/items/makefile.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# [ Novell Inc. Cédric Bosdonnat <cbosdonnat@novell.com> ]
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=test-items
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-
-# --- Targets ------------------------------------------------------
-
-SHL1TARGET = borderline_test
-SHL1OBJS = \
- $(SLO)$/borderline_test.obj
-
-SHL1LIBS= \
- $(SLB)$/items.lib \
- $(SLB)$/misc.lib \
- $(SLB)$/rtf.lib \
- $(SLB)$/uno.lib \
- $(SLB)$/accessibility.lib \
- $(SLB)$/editeng.lib \
- $(SLB)$/outliner.lib \
- $(SLB)$/xml.lib
-
-SHL1STDLIBS= \
- $(CPPUNITLIB) \
- $(XMLOFFLIB) \
- $(BASEGFXLIB) \
- $(LNGLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SOTLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(I18NPAPERLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(ICUUCLIB)
-
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/editeng/qa/items/version.map b/editeng/qa/items/version.map
deleted file mode 100644
index 01cc9afa06e0..000000000000
--- a/editeng/qa/items/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jim Bob <jim@bob.org>
-# Ted <ted@bear.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};