diff options
40 files changed, 68 insertions, 583 deletions
diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk deleted file mode 100644 index ca22ebbb9700..000000000000 --- a/sal/CppunitTest_sal_bytesequence.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_bytesequence)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ - sal/qa/ByteSequence/ByteSequence \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk new file mode 100644 index 000000000000..b69e330a87a6 --- /dev/null +++ b/sal/CppunitTest_sal_rtl.mk @@ -0,0 +1,67 @@ +# -*- 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/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl,\ + sal/qa/ByteSequence/ByteSequence \ + sal/qa/OStringBuffer/rtl_OStringBuffer \ + sal/qa/rtl/alloc/rtl_alloc \ + sal/qa/rtl/bootstrap/expand \ + sal/qa/rtl/cipher/rtl_cipher \ + sal/qa/rtl/crc32/rtl_crc32 \ + sal/qa/rtl/digest/rtl_digest \ + sal/qa/rtl/doublelock/rtl_doublelocking \ + sal/qa/rtl/locale/rtl_locale \ + sal/qa/rtl/math/test-rtl-math \ + sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar \ + sal/qa/rtl/oustringbuffer/test_oustringbuffer_appenduninitialized \ + sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign \ + sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring \ + sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32 \ + sal/qa/rtl/oustring/rtl_OUString2 \ + sal/qa/rtl/process/rtl_Process \ + sal/qa/rtl/random/rtl_random \ + sal/qa/rtl/ref/rtl_ref \ + sal/qa/rtl/strings/test_strings_replace \ + sal/qa/rtl/strings/test_ostring \ + sal/qa/rtl/strings/test_ostring_concat \ + sal/qa/rtl/strings/test_ostring_stringliterals \ + sal/qa/rtl/strings/test_oustring_compare \ + sal/qa/rtl/strings/test_oustring_concat \ + sal/qa/rtl/strings/test_oustring_convert \ + sal/qa/rtl/strings/test_oustring_endswith \ + sal/qa/rtl/strings/test_oustring_startswith \ + sal/qa/rtl/strings/test_oustring_stringliterals \ + sal/qa/rtl/strings/test_strings_toint \ + sal/qa/rtl/strings/test_strings_valuex \ + sal/qa/rtl/textenc/rtl_tencinfo \ + sal/qa/rtl/textenc/rtl_textcvt \ + sal/qa/rtl/uri/rtl_Uri \ + sal/qa/rtl/uri/rtl_testuri \ + sal/qa/rtl/uuid/rtl_Uuid \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_set_include,sal_rtl,\ + -I$(SRCDIR)/sal/qa/inc \ + $$(INCLUDE) \ +)) + +# The test uses O(U)String capabilities that dlopen this lib: +$(call gb_CppunitTest_get_target,sal_rtl) : \ + $(call gb_Library_get_target,sal_textenc) + +$(eval $(call gb_CppunitTest_use_external,sal_rtl,boost_headers)) + +# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk deleted file mode 100644 index 4a1d6e48ca59..000000000000 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_alloc)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ - sal/qa/rtl/alloc/rtl_alloc \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_bootstrap.mk b/sal/CppunitTest_sal_rtl_bootstrap.mk deleted file mode 100644 index f5771ea02b66..000000000000 --- a/sal/CppunitTest_sal_rtl_bootstrap.mk +++ /dev/null @@ -1,21 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_bootstrap)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_bootstrap, \ - sal/qa/rtl/bootstrap/expand \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_bootstrap, \ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk deleted file mode 100644 index 551c23e68b5b..000000000000 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_cipher)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ - sal/qa/rtl/cipher/rtl_cipher \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk deleted file mode 100644 index c4a02968fe92..000000000000 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_crc32)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ - sal/qa/rtl/crc32/rtl_crc32 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_digest.mk b/sal/CppunitTest_sal_rtl_digest.mk deleted file mode 100644 index 25a3eb7e4adb..000000000000 --- a/sal/CppunitTest_sal_rtl_digest.mk +++ /dev/null @@ -1,24 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_digest)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_digest,\ - sal/qa/rtl/digest/rtl_digest \ -)) - -$(eval $(call gb_CppunitTest_use_external,sal_rtl_digest,boost_headers)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_digest,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk deleted file mode 100644 index 87da478830f6..000000000000 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_doublelock)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ - sal/qa/rtl/doublelock/rtl_doublelocking \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk deleted file mode 100644 index b937549e2e06..000000000000 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_locale)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ - sal/qa/rtl/locale/rtl_locale \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk deleted file mode 100644 index 8e03adfdf7b9..000000000000 --- a/sal/CppunitTest_sal_rtl_math.mk +++ /dev/null @@ -1,21 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_math)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ - sal/qa/rtl/math/test-rtl-math \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk deleted file mode 100644 index 3c09782c5ca1..000000000000 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_ostringbuffer)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ - sal/qa/OStringBuffer/rtl_OStringBuffer \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustring.mk b/sal/CppunitTest_sal_rtl_oustring.mk deleted file mode 100644 index 1877ab32411f..000000000000 --- a/sal/CppunitTest_sal_rtl_oustring.mk +++ /dev/null @@ -1,30 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_oustring)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustring,\ - sal/qa/rtl/oustring/rtl_OUString2 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustring,\ - sal \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_CppunitTest_set_include,sal_rtl_oustring,\ - -I$(SRCDIR)/sal/qa/inc \ - $$(INCLUDE) \ -)) - -# The test uses O(U)String capabilities that dlopen this lib: -$(call gb_CppunitTest_get_target,sal_rtl_oustring) : \ - $(call gb_Library_get_target,sal_textenc) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk deleted file mode 100644 index b94b55df8924..000000000000 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ /dev/null @@ -1,26 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_oustringbuffer)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar \ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_appenduninitialized \ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign \ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional \ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring \ - sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_process.mk b/sal/CppunitTest_sal_rtl_process.mk deleted file mode 100644 index 1744707d9419..000000000000 --- a/sal/CppunitTest_sal_rtl_process.mk +++ /dev/null @@ -1,22 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_process)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_process,\ - sal/qa/rtl/process/rtl_Process \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_process,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_random.mk b/sal/CppunitTest_sal_rtl_random.mk deleted file mode 100644 index c8f270148efc..000000000000 --- a/sal/CppunitTest_sal_rtl_random.mk +++ /dev/null @@ -1,21 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_random)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_random,\ - sal/qa/rtl/random/rtl_random \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_random,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ref.mk b/sal/CppunitTest_sal_rtl_ref.mk deleted file mode 100644 index a72930ad6ebc..000000000000 --- a/sal/CppunitTest_sal_rtl_ref.mk +++ /dev/null @@ -1,21 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_ref)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ref,\ - sal/qa/rtl/ref/rtl_ref \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ref,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk deleted file mode 100644 index 57c92f48d408..000000000000 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ /dev/null @@ -1,38 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_strings)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ - sal/qa/rtl/strings/test_strings_replace \ - sal/qa/rtl/strings/test_ostring \ - sal/qa/rtl/strings/test_ostring_concat \ - sal/qa/rtl/strings/test_ostring_stringliterals \ - sal/qa/rtl/strings/test_oustring_compare \ - sal/qa/rtl/strings/test_oustring_concat \ - sal/qa/rtl/strings/test_oustring_convert \ - sal/qa/rtl/strings/test_oustring_endswith \ - sal/qa/rtl/strings/test_oustring_noadditional \ - sal/qa/rtl/strings/test_oustring_startswith \ - sal/qa/rtl/strings/test_oustring_stringliterals \ - sal/qa/rtl/strings/test_strings_toint \ - sal/qa/rtl/strings/test_strings_valuex \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ - sal \ - $(gb_UWINAPI) \ -)) - -# The test uses O(U)String capabilities that dlopen this lib -$(call gb_CppunitTest_get_target,sal_rtl_strings) : \ - $(call gb_Library_get_target,sal_textenc) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_textenc.mk b/sal/CppunitTest_sal_rtl_textenc.mk deleted file mode 100644 index e9b0c994cbbc..000000000000 --- a/sal/CppunitTest_sal_rtl_textenc.mk +++ /dev/null @@ -1,26 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_textenc)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_textenc,\ - sal/qa/rtl/textenc/rtl_tencinfo \ - sal/qa/rtl/textenc/rtl_textcvt \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_textenc,\ - sal \ - $(gb_UWINAPI) \ -)) - -# The test uses O(U)String capabilities that dlopen this lib -$(call gb_CppunitTest_get_target,sal_rtl_textenc) : \ - $(call gb_Library_get_target,sal_textenc) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk deleted file mode 100644 index 3e457b0fb527..000000000000 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ /dev/null @@ -1,32 +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/. -# -# Major Contributor(s): -# Copyright (C) 2012 Radu Ioan <ioan.radu.g@gmail.com> (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_uri)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ - sal/qa/rtl/uri/rtl_Uri \ - sal/qa/rtl/uri/rtl_testuri \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ - sal \ - $(gb_UWINAPI) \ -)) - -# The test uses O(U)String capabilities that dlopen this lib -$(call gb_CppunitTest_get_target,sal_rtl_uri) : \ - $(call gb_Library_get_target,sal_textenc) - -# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk deleted file mode 100644 index df0e6858cd9d..000000000000 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ /dev/null @@ -1,27 +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/. -# -# Major Contributor(s): -# Copyright (C) 2012 Radu Ioan <ioan.radu.g@gmail.com> (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. - -$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_uuid)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ - sal/qa/rtl/uuid/rtl_Uuid \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1d79a163da4d..3a40ed75105b 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -28,26 +28,8 @@ $(eval $(call gb_Module_add_targets,sal,\ $(eval $(call gb_Module_add_check_targets,sal,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \ $(if $(filter-out MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \ - CppunitTest_sal_bytesequence \ CppunitTest_sal_osl \ - CppunitTest_sal_rtl_alloc \ - CppunitTest_sal_rtl_bootstrap \ - CppunitTest_sal_rtl_cipher \ - CppunitTest_sal_rtl_crc32 \ - CppunitTest_sal_rtl_digest \ - CppunitTest_sal_rtl_doublelock \ - CppunitTest_sal_rtl_locale \ - CppunitTest_sal_rtl_math \ - CppunitTest_sal_rtl_ostringbuffer \ - CppunitTest_sal_rtl_oustring \ - CppunitTest_sal_rtl_oustringbuffer \ - CppunitTest_sal_rtl_process \ - CppunitTest_sal_rtl_random \ - CppunitTest_sal_rtl_ref \ - CppunitTest_sal_rtl_strings \ - CppunitTest_sal_rtl_textenc \ - CppunitTest_sal_rtl_uri \ - CppunitTest_sal_rtl_uuid \ + CppunitTest_sal_rtl \ CppunitTest_sal_types \ )) 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: */ |