fix building of tests

6 files changed, 15 insertions, 21 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:
         *;
diff --git a/tools/test/export.map b/tools/test/export.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/tools/test/export.map
+++ b/tools/test/export.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
index ab2cfd8e6676..573dd91f736d 100644
--- a/tools/test/makefile.mk
+++ b/tools/test/makefile.mk
@@ -46,7 +46,6 @@ SHL1OBJS=  \
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)	 \
                 $(TOOLSLIB)	 \
-                                $(TESTSHL2LIB)    \
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index 66d2ac50b352..a814fb2fea83 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.cxx
@@ -31,12 +31,13 @@
 #include "precompiled_tools.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 #include <rtl/math.hxx>
 #include <tools/fract.hxx>
 
-#include <stdio.h>
-
 namespace tools
 {
 
@@ -115,14 +116,9 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(tools::FractionTest, "FractionTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(FractionTest);
 } // namespace tools
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */