diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-24 14:25:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-24 15:12:18 +0200 |
| commit | 54e470685337c8c231b80ca9e95c11f9babf25c7 (patch) | |
| tree | 756503b53176effcff493b049ebd7230f04cdd96 /solenv | |
| parent | 8189c4c8bd94394dd603c2eac1c85b6fd2d2259a (diff) | |
gbuild: PythonTest: run tests with --headless
The python tests currently use the default desktop-dependent vclplug,
but should use svp like every other test.
Apparently there's no way to pass command line parameters through
python, so set SAL_USE_VCLPLUGIN=svp.
Change-Id: Idb9afd87a1721c5188aeecd9b1f83521f6431757
(cherry picked from commit a9833ee9c27fef2f34ce1061ebfdf44d525c35ca)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index ce5f5ed0e564..561ea648dc8d 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -52,7 +52,11 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS) UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=1 \ - $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + SAL_USE_VCLPLUGIN=svp \ + )) \ + $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ + $(gb_PythonTest_COMMAND) \ $(MODULES) \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ |