diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-14 02:21:27 +0100 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-17 09:35:10 +0000 |
commit | 474f5eebb8d86df3384ddecac1452c85524b0c28 (patch) | |
tree | 5e3f1bb64d3cfd1d190ba1a16cd1efeb4f072e41 /solenv/gbuild/platform/com_MSC_class.mk | |
parent | de3fd5d5378c95504d9c1ef1bedad8746921d2a6 (diff) |
refactor unittest help message
- get platform switch logic out of shell script
- platform specific stuff should be in $(GBUILDDIR)/platform, if
possible
- do not suggest shell-polluting exports, which might lead to confusion
later, suggest setting the var as a one-off addition to the make
command
- move exception caching down, as it is assumed to be used rather
rarely
Change-Id: I01db3ca07582a6c6213ebac86fddabb28c925d50
Reviewed-on: https://gerrit.libreoffice.org/19976
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv/gbuild/platform/com_MSC_class.mk')
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 14febde3a189..41bab51d7f21 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -370,6 +370,8 @@ endef # CppunitTest class +gb_CppunitTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-WNT.sh +gb_CppunitTest_PYTHONDEPS := $(call gb_Package_get_target,python3) gb_CppunitTest_DEFS := -D_DLL ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell cygpath -w $(gb_Library_DLLDIR));$(shell cygpath -w $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))) @@ -435,6 +437,7 @@ endef # PythonTest class gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) +gb_PythonTest_DEPS := $(call gb_Package_get_target,python3) # SrsPartTarget class |