diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 08:51:09 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 13:03:57 +0100 |
| commit | 39b81921d7ecf6b7b4c61f2564eded7cfce5bd0b (patch) | |
| tree | 400b244daeab3f298b6920e5df033359259b1063 /solenv/gbuild/CppunitTest.mk | |
| parent | 06ad764cfb36ece7f054ecb786cc0395346a6a68 (diff) | |
Pass some env vars into all kinds of tests
...not only CppunitTests, as had been changed with
d5ed903618f200456feed9b410b7bd1ed8daeb62 "Set CppunitTest-related env vars only
during CppunitTest". Despite those env vars having been deceptively set up
in solenv/gbuild/CppunitTest.mk, at least some of them may also be useful during
other tests, and may actually have been relied upon by other tests in the past.
Change-Id: I854dfb1786bb5e9e2de5fd77cb6323299320b544
Reviewed-on: https://gerrit.libreoffice.org/63784
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 21cff341d57d..283ea290d04a 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -19,13 +19,6 @@ # CppunitTest class -# Cap the number of threads unittests use. -gb_CppunitTest_ENV_VARS := MAX_CONCURRENCY=4 -# Disable searching for certificates by default -gb_CppunitTest_ENV_VARS += MOZILLA_CERTIFICATE_FOLDER=0 -# Avoid hanging if the cups daemon requests a password. -gb_CppunitTest_ENV_VARS += SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 - gb_CppunitTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3)) @@ -129,7 +122,7 @@ else ( \ $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \ $(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \ - $(gb_CppunitTest_ENV_VARS) \ + $(gb_TEST_ENV_VARS) \ $(if $(gb_CppunitTest__vcl_no_svp),,SAL_USE_VCLPLUGIN=$(or $(SAL_USE_VCLPLUGIN),svp)) \ $(EXTRA_ENV_VARS) \ $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \ |