diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-24 14:12:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-24 19:05:11 +0000 |
| commit | 6677759c29620796540a0265c4f6d0671f6a42c6 (patch) | |
| tree | bab9dbbb21a4d0b7b936631ba255d5e745657d4b /solenv/PythonTest_solenv_python.mk | |
| parent | e28b8b779b1465d72bc089138fde925e34e11893 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/PythonTest_solenv_python.mk')
| -rw-r--r-- | solenv/PythonTest_solenv_python.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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: |