From 6677759c29620796540a0265c4f6d0671f6a42c6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 24 Oct 2016 14:12:40 +0200 Subject: solenv: force gbuildtoide test to use the same "make" as the caller Possibly mis-matching make binaries could be the reason behind failures that have been observed on Jenkins: make[3]: Entering directory '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest' make[3]: *** internal error: invalid --jobserver-fds string 'gmake_semaphore_5488'. Stop. Also, to enable this: Revert "Revert "prep WinResTarget for WNT in testdir"" This reverts commit 6e261cb19e5751eb0553ad0c5b357b1a5747518c. Change-Id: Idb858b5eeced91f19c9dd5600c4fdc5370b73cc5 Reviewed-on: https://gerrit.libreoffice.org/30226 Tested-by: Jenkins Reviewed-by: Michael Stahl --- solenv/PythonTest_solenv_python.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'solenv/PythonTest_solenv_python.mk') diff --git a/solenv/PythonTest_solenv_python.mk b/solenv/PythonTest_solenv_python.mk index 8985ce2b5105..8ed1c20832df 100644 --- a/solenv/PythonTest_solenv_python.mk +++ b/solenv/PythonTest_solenv_python.mk @@ -13,4 +13,9 @@ $(eval $(call gb_PythonTest_add_modules,solenv_python,$(SRCDIR)/solenv/qa/python gbuildtoide \ )) +# force gbuildtoide.py to use the same make binary as is used here +$(eval $(call gb_PythonTest_set_defs,solenv_python,\ + MAKE="$(MAKE)" \ +)) + # vim: set noet sw=4 ts=4: -- cgit