diff options
| author | David Tardon <dtardon@redhat.com> | 2010-10-30 17:50:59 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-10-30 17:50:59 +0200 |
| commit | 96295f0000107bca98f444413ce5879027b28e49 (patch) | |
| tree | e27f85dbba8004a497f05713890abf9aa9bd3d80 /tools/qa | |
| parent | 5b4d4af3e8bc3b5fb07bceecefc2a47d8e4b8b18 (diff) | |
fix building of tests
Diffstat (limited to 'tools/qa')
| -rw-r--r-- | tools/qa/makefile.mk | 6 | ||||
| -rw-r--r-- | tools/qa/test_pathutils.cxx | 9 | ||||
| -rw-r--r-- | tools/qa/version.map | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk index abaea848c1db..167f08218228 100644 --- a/tools/qa/makefile.mk +++ b/tools/qa/makefile.mk @@ -45,8 +45,4 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk - -ALLTAR: test - -test .PHONY: $(SHL1TARGETN) - $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb +.INCLUDE: _cppunit.mk diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx index 801019e58b4a..99046a6211c9 100644 --- a/tools/qa/test_pathutils.cxx +++ b/tools/qa/test_pathutils.cxx @@ -31,7 +31,10 @@ #include <cwchar> -#include "testshl/simpleheader.hxx" +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> + #include "tools/pathutils.hxx" namespace { @@ -70,10 +73,10 @@ void Test::testBuildPath() { buildPath(L"", L"..\\a", L"..\\a"); } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/qa/version.map b/tools/qa/version.map index 7321bbca16ad..3308588ef6f8 100644 --- a/tools/qa/version.map +++ b/tools/qa/version.map @@ -27,7 +27,7 @@ UDK_3_0_0 { global: - registerAllTestFunction; + cppunitTestPlugIn; local: *; |