From 8e743e46781b252f41227d809dec43d3c4c1d01f Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 17 Dec 2016 08:58:42 +0100 Subject: tdf#97283: Merge sal osl tests to one makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Leave sal_osl_security alone because it does not use CPPUNIT_PLUGIN_IMPLEMENT. Change-Id: Iced8bb80c3ae661d371c087d7178a373ffd802e0 Reviewed-on: https://gerrit.libreoffice.org/32142 Tested-by: Jenkins Reviewed-by: Matúš Kukan --- sal/qa/osl/file/osl_File.cxx | 2 -- sal/qa/osl/file/osl_old_test_file.cxx | 2 -- sal/qa/osl/file/test_cpy_wrt_file.cxx | 6 ------ .../osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx | 2 -- sal/qa/osl/module/osl_Module.cxx | 4 ---- sal/qa/osl/mutex/osl_Mutex.cxx | 2 -- sal/qa/osl/pipe/osl_Pipe.cxx | 2 -- sal/qa/osl/process/osl_Thread.cxx | 4 ---- sal/qa/osl/process/osl_process.cxx | 2 -- sal/qa/osl/profile/osl_old_testprofile.cxx | 2 -- sal/qa/osl/setthreadname/test-setthreadname.cxx | 2 -- 11 files changed, 30 deletions(-) (limited to 'sal/qa/osl') diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 14922cd5e15e..1f8841c129f0 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/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( ) diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index ea4f52f7fe26..243dd6de89de 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/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: */ diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 3c7c0e315660..1d4fac1ca2e2 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/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: */ diff --git a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx index 5d8d24962e0a..51022d9e3fe2 100644 --- a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx +++ b/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: */ diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 2cfd1dda135c..8f9a2f29fe26 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/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: */ diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index c6e07b9cce80..023bb29d68e9 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/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 diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 988df004cf70..9176118338ce 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/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: */ diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 32840a69c80c..24f8daccd9f8 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/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: */ diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index d97b25190403..52defec3279e 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/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: */ diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 903851b3ec8d..54d0430182f4 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/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: */ diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index 600573008eba..529ce8bd5876 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/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: */ -- cgit