diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-17 10:30:36 +0100 |
---|---|---|
committer | Matúš Kukan <matus@libreoffice.org> | 2016-12-23 11:18:41 +0000 |
commit | 597d178c2b516ab0cff4e4f86246d47ce9700f18 (patch) | |
tree | f7c6ae8071cd9f5b5b5133fa9d53a3c14bae6273 /sal/qa | |
parent | 8e743e46781b252f41227d809dec43d3c4c1d01f (diff) |
tdf#97283: Merge sal rtl tests to one makefile
Change-Id: I1b78276e08feef9b6f49e5abe002391c50a8d2cc
Reviewed-on: https://gerrit.libreoffice.org/32143
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Diffstat (limited to 'sal/qa')
-rw-r--r-- | sal/qa/ByteSequence/ByteSequence.cxx | 2 | ||||
-rw-r--r-- | sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/bootstrap/expand.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/cipher/rtl_cipher.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/crc32/rtl_crc32.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/digest/rtl_digest.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/locale/rtl_locale.cxx | 6 | ||||
-rw-r--r-- | sal/qa/rtl/math/test-rtl-math.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/oustring/rtl_OUString2.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx | 25 | ||||
-rw-r--r-- | sal/qa/rtl/process/rtl_Process.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/random/rtl_random.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/ref/rtl_ref.cxx | 1 | ||||
-rw-r--r-- | sal/qa/rtl/strings/test_oustring_noadditional.cxx | 25 | ||||
-rw-r--r-- | sal/qa/rtl/textenc/rtl_tencinfo.cxx | 3 | ||||
-rw-r--r-- | sal/qa/rtl/uri/rtl_Uri.cxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/uri/rtl_testuri.cxx | 1 | ||||
-rw-r--r-- | sal/qa/rtl/uuid/rtl_Uuid.cxx | 4 |
19 files changed, 0 insertions, 101 deletions
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx index abe5e8fc4a6e..603bc5835ae7 100644 --- a/sal/qa/ByteSequence/ByteSequence.cxx +++ b/sal/qa/ByteSequence/ByteSequence.cxx @@ -180,6 +180,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 117973258070..170676302432 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -16031,6 +16031,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::AppendUninitialized); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::remove); -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx index 2e76cbf5d21f..ef8a27db7d69 100644 --- a/sal/qa/rtl/bootstrap/expand.cxx +++ b/sal/qa/rtl/bootstrap/expand.cxx @@ -55,6 +55,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index a2a55ffc8ef6..e8877a92c5d5 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -536,8 +536,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::initBF); } // namespace rtl_cipher -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 398dc2dfe54b..00933b5890bc 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -151,8 +151,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(rtl_CRC32::test); } // namespace rtl_CRC32 -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index dc491137de9b..93a2cd6e0c63 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -443,6 +443,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DigestTest); } // namespace rtl_digest -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 910455b79ae2..a328b4f0fffb 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -215,8 +215,4 @@ namespace rtl_DoubleLocking CPPUNIT_TEST_SUITE_REGISTRATION(rtl_DoubleLocking::getValue); } // namespace rtl_DoubleLocking -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 751571958f7e..b08011609fb9 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -18,7 +18,6 @@ */ #include <sal/types.h> -#include <osl/thread.h> #include <rtl/locale.h> #include <rtl/ustring.hxx> @@ -278,9 +277,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::hashCode); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::equals); } // namespace rtl_locale -// 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. - -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index a2e3e2e68047..f9f041a17f95 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -328,6 +328,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 84859d1a4789..0fb7a09a95aa 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -1097,8 +1097,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OUString::convertFromString); } // namespace rtl_OUString -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx deleted file mode 100644 index d2d66a61ea93..000000000000 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sal/types.h> -#include <cppunit/plugin/TestPlugIn.h> - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index ae0eb32500ba..7101bade2fc7 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -258,8 +258,4 @@ public: CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getAppCommandArg, "rtl_Process"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getGlobalProcessId, "rtl_Process"); -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index 14421d652560..7d887a31ed42 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -359,6 +359,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::getBytes); } // namespace rtl_random -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx index 415abafd554d..d8dc59e65839 100644 --- a/sal/qa/rtl/ref/rtl_ref.cxx +++ b/sal/qa/rtl/ref/rtl_ref.cxx @@ -107,6 +107,5 @@ class TestReferenceRefCounting : public CppUnit::TestFixture } // namespace rtl_ref CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ref::TestReferenceRefCounting); -CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx deleted file mode 100644 index d2d66a61ea93..000000000000 --- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sal/types.h> -#include <cppunit/plugin/TestPlugIn.h> - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index a6adf0cbabb3..a67fc9cc419c 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -21,7 +21,6 @@ #include <string.h> -#include <osl/thread.h> #include <rtl/tencinfo.h> #include <cppunit/TestFixture.h> @@ -1665,6 +1664,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testBestWindows); CPPUNIT_TEST_SUITE_REGISTRATION(testTextEncodingInfo); CPPUNIT_TEST_SUITE_REGISTRATION(testEncodingFromUnix); -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index 48d5ba3af583..eb024402b49b 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -77,8 +77,4 @@ namespace Stringtest CPPUNIT_TEST_SUITE_REGISTRATION( Stringtest::Convert ); -// LLA: doku anpassen!!! - -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 00e8dd56b7db..e3ced41cddbe 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -519,6 +519,5 @@ void Test::test_Uri() { } CPPUNIT_TEST_SUITE_REGISTRATION(Test); -// NOADDITIONAL; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 714d4b27555a..21d5ca65fb4b 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -151,8 +151,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createUuid); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createNamedUuid); } // namespace rtl_Uuid -// 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. -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |