[Libreoffice-commits] .: 2 commits - codemaker/prj codemaker/test sal/prj sal/qa
David Tardon
dtardon at kemper.freedesktop.org
Tue Mar 15 00:47:49 PDT 2011
codemaker/prj/build.lst | 2 -
codemaker/test/cppumaker/makefile.mk | 2 -
codemaker/test/cppumaker/test_codemaker_cppumaker.cxx | 8 ++--
codemaker/test/cppumaker/version.map | 2 -
sal/prj/build.lst | 1
sal/qa/sal/makefile.mk | 8 +---
sal/qa/sal/test_types.cxx | 9 +++-
sal/qa/sal/version.map | 34 ------------------
8 files changed, 17 insertions(+), 49 deletions(-)
New commits:
commit d559b0c5ace3c0c5125a67acc844b3d16d5ca991
Author: Wilhelm Pflueger <Wilhelm.Pflueger at web.de>
Date: Fri Mar 11 00:59:16 2011 +0100
EasyHacks: Reanimated tests in ure/codemaker
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index e0520d5..d9b1066 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -7,5 +7,5 @@ cm codemaker\source\commoncpp nmake - all cm_cpp cm_inc NULL
cm codemaker\source\cppumaker nmake - all cm_cppumaker cm_codemaker cm_cpp cm_inc NULL
cm codemaker\source\commonjava nmake - all cm_java cm_inc NULL
cm codemaker\source\javamaker nmake - all cm_javamaker cm_codemaker cm_java cm_inc NULL
-
+cm codemaker\test\cppumaker nmake - all cm_test_cppumaker NULL
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index 5060f75..c91d3c6 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -70,4 +70,4 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
$(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
test .PHONY: $(SHL1TARGETN)
- $(AUGMENT_LIBRARY_PATH) testshl2 $<
+ $(CPPUNITTESTER) $<
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index a55cefa..6d9df43 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -367,7 +367,9 @@
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Type.hxx"
#include "com/sun/star/uno/TypeClass.hpp"
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
@@ -561,10 +563,10 @@ void Test::testConstants() {
test::codemaker::cppumaker::Constants::unsignedHyperMax);
}
-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/codemaker/test/cppumaker/version.map b/codemaker/test/cppumaker/version.map
index f313c44..0dbbcc5 100644
--- a/codemaker/test/cppumaker/version.map
+++ b/codemaker/test/cppumaker/version.map
@@ -27,7 +27,7 @@
UDK_3_0_0 {
global:
- registerAllTestFunction;
+ cppunitTestPlugIn;
local:
*;
commit 9cb06706b0e7d14f4bf1c67148cbe199ad2dceca
Author: Theo van Klaveren <theo.van.klaveren at gmail.com>
Date: Thu Mar 10 11:34:40 2011 +0100
Make the qa/sal unit test build, and use it.
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index ddbc446..dea5c31 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -26,3 +26,4 @@ sa sal\qa\osl\process nmake - all sa_qa_osl_process sa_cppunittester sa_util NUL
sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util NULL
sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util NULL
sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util NULL
+sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index 954d339..e5ccce3 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -36,15 +36,11 @@ ENABLE_EXCEPTIONS := TRUE
SHL1TARGET = $(TARGET)_types
SHL1OBJS = $(SLO)$/test_types.obj
SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
-SHL1VERSIONMAP = version.map
+SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx
index 3b6c85c..03d30a1 100644
--- a/sal/qa/sal/test_types.cxx
+++ b/sal/qa/sal/test_types.cxx
@@ -33,7 +33,10 @@
#include <stdio.h> // C99 snprintf not necessarily in <cstdio>
#include <string.h> // wntmsci10 does not know <cstring> std::strcmp
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
#include "sal/types.h"
namespace {
@@ -75,10 +78,10 @@ void Test::test() {
testPrintf("ABC", "%" SAL_PRIXUINTPTR, static_cast< sal_uIntPtr >(0xabc));
}
-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/sal/qa/sal/version.map b/sal/qa/sal/version.map
deleted file mode 100644
index f313c44..0000000
--- a/sal/qa/sal/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- registerAllTestFunction;
-
- local:
- *;
-};
More information about the Libreoffice-commits
mailing list