tdf#97283: Merge sal osl tests to one makefile

Leave sal_osl_security alone because
it does not use CPPUNIT_PLUGIN_IMPLEMENT.

Change-Id: Iced8bb80c3ae661d371c087d7178a373ffd802e0
Reviewed-on: https://gerrit.libreoffice.org/32142Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>

sal/CppunitTest_sal_osl_module.mk → sal/CppunitTest_sal_osl.mk

@@ -8,19 +8,37 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_module))
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl))
 
-# the test uses the library created by Module_DLL
-$(call gb_CppunitTest_get_target,sal_osl_module) : \
-    $(call gb_CppunitTest_get_target,Module_DLL)
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\
-    sal/qa/osl/module/osl_Module \
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\
+	sal/qa/osl/condition/osl_Condition \
+	$(if $(filter $(OS),WNT),,sal/qa/osl/file/osl_File) \
+	sal/qa/osl/file/osl_old_test_file \
+	sal/qa/osl/file/test_cpy_wrt_file \
+	sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl \
+	$(if $(DISABLE_DYNLOADING),,sal/qa/osl/module/osl_Module) \
+	sal/qa/osl/mutex/osl_Mutex \
+	sal/qa/osl/pipe/osl_Pipe \
+	sal/qa/osl/process/osl_process \
+	sal/qa/osl/process/osl_Thread \
+	sal/qa/osl/profile/osl_old_testprofile \
+	sal/qa/osl/setthreadname/test-setthreadname \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\
-    sal \
+$(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
+	sal \
 	$(gb_UWINAPI) \
 ))
 
+# the test uses the library created by Module_DLL
+$(call gb_CppunitTest_get_target,sal_osl) : \
+	$(call gb_CppunitTest_get_target,Module_DLL)
+
+$(eval $(call gb_CppunitTest_use_executable,sal_osl,osl_process_child))
+
+$(eval $(call gb_CppunitTest_use_externals,sal_osl,\
+	boost_headers \
+	valgrind \
+))
+
 # vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_condition.mk

-# -*- 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_osl_condition))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
-    sal/qa/osl/condition/osl_Condition \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_file.mk

-# -*- 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_osl_file))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\
-    sal/qa/osl/file/osl_File \
-))
-
-$(eval $(call gb_CppunitTest_use_external,sal_osl_file,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk

-# -*- 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_osl_getsystempathfromfileurl))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfileurl,\
-    sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_mutex.mk

-# -*- 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_osl_mutex))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \
-	sal/qa/osl/mutex/osl_Mutex \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_old_test_file.mk

-# -*- 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_osl_old_test_file))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
-    sal/qa/osl/file/osl_old_test_file \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_pipe.mk

-# -*- 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_osl_pipe))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
-    sal/qa/osl/pipe/osl_Pipe \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_process.mk

-# -*- 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_osl_process))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\
-    sal/qa/osl/process/osl_process \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sal_osl_process,\
-    valgrind \
-))
-
-$(eval $(call gb_CppunitTest_use_executable,sal_osl_process,osl_process_child))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_profile.mk

-# -*- 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_osl_profile))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \
-    sal/qa/osl/profile/osl_old_testprofile \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_setthreadname.mk

-# -*- 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_osl_setthreadname))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \
-	sal/qa/osl/setthreadname/test-setthreadname \
-))
-
-$(eval $(call gb_CppunitTest_use_external,sal_osl_setthreadname,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_osl_thread.mk

-# -*- 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_osl_thread))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\
-    sal/qa/osl/process/osl_Thread \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/CppunitTest_sal_tcwf.mk

-# -*- 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/.
-#
-
-# sal_tcwf
-$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
-    sal/qa/osl/file/test_cpy_wrt_file \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\
-    sal \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:

sal/Module_sal.mk

@@ -22,24 +22,14 @@ $(eval $(call gb_Module_add_targets,sal,\
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,sal,\
-		Executable_osl_process_child \
+	Executable_osl_process_child \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sal,\
-	$(if $(filter $(OS),WNT),,CppunitTest_sal_osl_file) \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
 	$(if $(filter-out MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
 	CppunitTest_sal_bytesequence \
-	CppunitTest_sal_osl_condition \
-	CppunitTest_sal_osl_getsystempathfromfileurl \
-	CppunitTest_sal_osl_mutex \
-	CppunitTest_sal_osl_old_test_file \
-	CppunitTest_sal_osl_pipe \
-	CppunitTest_sal_osl_process \
-	CppunitTest_sal_osl_profile \
-	CppunitTest_sal_osl_setthreadname \
-	CppunitTest_sal_osl_thread \
+	CppunitTest_sal_osl \
 	CppunitTest_sal_rtl_alloc \
 	CppunitTest_sal_rtl_bootstrap \
 	CppunitTest_sal_rtl_cipher \
@@ -58,7 +48,6 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 	CppunitTest_sal_rtl_textenc \
 	CppunitTest_sal_rtl_uri \
 	CppunitTest_sal_rtl_uuid \
-	CppunitTest_sal_tcwf \
 	CppunitTest_sal_types \
 ))
 

sal/qa/osl/file/osl_File.cxx

@@ -5028,8 +5028,6 @@ namespace osl_Directory
     CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::createPath );
 }// namespace osl_Directory
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /** get Current PID.
 */
 inline ::rtl::OUString getCurrentPID(  )

sal/qa/osl/file/osl_old_test_file.cxx

@@ -141,6 +141,4 @@ void oldtestfile::test_file_004()
 
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/file/test_cpy_wrt_file.cxx

@@ -27,10 +27,6 @@
 
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-
 class test_osl_writeFile : public CppUnit::TestFixture
 {
 public:
@@ -75,6 +71,4 @@ public:
 // register test suites
 CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx

@@ -242,6 +242,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/module/osl_Module.cxx

@@ -360,8 +360,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getFunctionSymbol);
 
 } // namespace osl_Module
 
-// 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: */

sal/qa/osl/mutex/osl_Mutex.cxx

@@ -853,8 +853,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset);
 } // namespace osl_ResettableGuard
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 // The following sets variables for GNU EMACS
 // Local Variables:
 // tab-width:4

sal/qa/osl/pipe/osl_Pipe.cxx

@@ -874,6 +874,4 @@ namespace osl_StreamPipe
 
 } // namespace osl_StreamPipe
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/process/osl_Thread.cxx

@@ -1914,8 +1914,4 @@ namespace osl_ThreadData
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::getData);
 } // namespace osl_ThreadData
 
-// 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: */

sal/qa/osl/process/osl_process.cxx

@@ -459,6 +459,4 @@ public:
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/profile/osl_old_testprofile.cxx

@@ -59,6 +59,4 @@ void oldtests::test_profile()
 
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests );
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sal/qa/osl/setthreadname/test-setthreadname.cxx

@@ -77,6 +77,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */