[Libreoffice-commits] core.git: sw/CppunitTest_sw_tox.mk sw/CppunitTest_sw_uwriter.mk sw/Module_sw.mk sw/qa

[Michael Stahl]

 sw/CppunitTest_sw_tox.mk                         |   87 -----------------------
 sw/CppunitTest_sw_uwriter.mk                     |    3 
 sw/Module_sw.mk                                  |    4 -
 sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx |    3 
 4 files changed, 3 insertions(+), 94 deletions(-)

New commits:
commit d2a4e7c7f70a0ff0769ed228320833fa6b29bff9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Aug 21 20:44:03 2014 +0200

    sw: _one_ unit test with use_library_objects sw ought to be enough
    
    Linking those things takes a lot of RAM.
    
    Change-Id: I4db9ee3f07f97601d526ab3f905ecadbf4c552ca

diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk
deleted file mode 100644
index 25ab0fc..0000000
--- a/sw/CppunitTest_sw_tox.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# This file contains the unit test definition for class in the sources/core/tox subfolder
-# The macro which defines the main method is contained in test_ToxWhitespaceStripper.cxx
-
-$(eval $(call gb_CppunitTest_CppunitTest,sw_tox))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox, \
-	sw/qa/cppunit/tox/test_ToxWhitespaceStripper \
-	sw/qa/cppunit/tox/test_ToxLinkProcessor \
-	sw/qa/cppunit/tox/test_ToxTextGenerator \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_tox, \
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
-	basegfx \
-	comphelper \
-	cppu \
-	cppuhelper \
-	drawinglayer \
-	editeng \
-	i18nlangtag \
-	i18nutil \
-	lng \
-	sal \
-	salhelper \
-	sax \
-	sb \
-	sfx \
-	sot \
-	svl \
-	svt \
-	svx \
-	svxcore \
-	test \
-	unotest \
-	vcl \
-	tk \
-	tl \
-	ucbhelper \
-	utl \
-	xmlreader \
-	xo \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,sw_tox, \
-	sw \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_tox, \
-	boost_headers \
-	icuuc \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_tox,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_components,sw_tox, \
-	configmgr/source/configmgr \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_tox))
-$(eval $(call gb_CppunitTest_use_ure,sw_tox))
-$(eval $(call gb_CppunitTest_use_vcl,sw_tox))
-
-$(eval $(call gb_CppunitTest_set_include,sw_tox,\
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/source/core/inc \
-    $$(INCLUDE) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 495d088..287399a 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter))
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \
     sw/qa/core/uwriter \
     sw/qa/core/Test-BigPtrArray \
+	sw/qa/cppunit/tox/test_ToxWhitespaceStripper \
+	sw/qa/cppunit/tox/test_ToxLinkProcessor \
+	sw/qa/cppunit/tox/test_ToxTextGenerator \
 ))
 
 $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 7e645c8..33ea3f7 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -46,10 +46,6 @@ $(eval $(call gb_Module_add_targets,sw,\
 
 endif
 
-$(eval $(call gb_Module_add_check_targets,sw,\
-    CppunitTest_sw_tox \
-))
-
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_uwriter \
     CppunitTest_sw_htmlexport \
diff --git a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
index adaffd9..30da0bd 100644
--- a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
+++ b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
@@ -18,7 +18,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
 
 using namespace sw;
 
@@ -145,6 +144,4 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested()
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(ToxWhitespaceStripperTest);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */