diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-17 08:58:42 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus@libreoffice.org> | 2016-12-23 10:19:18 +0000 |
| commit | 8e743e46781b252f41227d809dec43d3c4c1d01f (patch) | |
| tree | 85884ceb607e506a372d49ab515b025319a9ef81 /sal/Module_sal.mk | |
| parent | dbc3cfb011f3bbbc0d95acc362dc7aa5bca6e831 (diff) | |
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/32142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Diffstat (limited to 'sal/Module_sal.mk')
| -rw-r--r-- | sal/Module_sal.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 6f8cbc05a191..1d79a163da4d 100644 --- a/sal/Module_sal.mk +++ b/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 \ )) |