sb123: #i111602# adapted desktop/qa/deployment_misc to new test framework

This commit is contained in:
sb 2010-05-14 16:49:41 +02:00
parent 7ecb8a1b51
commit cd8bfb54fe
4 changed files with 12 additions and 12 deletions

View file

@ -1,4 +1,4 @@
dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr NULL
dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr cppunit NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
@ -42,3 +42,4 @@ dt desktop\registry\data\org\openoffice\Office nmake - a
dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL
dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL
dt desktop\source\registration\com\sun\star\registration nmake - all sn_regjob sn_svctag NULL
dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL

View file

@ -35,20 +35,16 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_dp_version.obj
SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1RPATH = NONE
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
$(TESTSHL2) $(SHL1TARGETN)
.INCLUDE : _cppunit.mk

View file

@ -32,7 +32,10 @@
#include <cstddef>
#include "testshl/simpleheader.hxx"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
@ -83,8 +86,8 @@ void Test::test() {
}
}
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
NOADDITIONAL;
CPPUNIT_PLUGIN_IMPLEMENT();

View file

@ -27,7 +27,7 @@
UDK_3_0_0 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;