diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-05-19 13:35:13 -0500 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-07 07:22:28 +0000 |
| commit | c720aeead20cd9f7a675970ae3810b9904dade84 (patch) | |
| tree | 741ff539fe56c41a51df1d598fda96dce7959b69 /solenv | |
| parent | 02a5941c6ea747fa26dcbb27aa45ef9faac9c857 (diff) | |
shortcut the signal handler during batch test
Reviewed-on: https://gerrit.libreoffice.org/25178
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 9d2f7be4e65595241db3cf5135b69bd9e4ce6a30)
try to avoid 'by-design' solar-mutex deadlock during ci
Reviewed-on: https://gerrit.libreoffice.org/25839
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 6b3b352b06d92ef20194b9a992a521af2ef07b48)
Change-Id: I7848555743e8d54e755dc82cbf0148eeed54110f
Reviewed-on: https://gerrit.libreoffice.org/25978
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 278006bd8631..bc449067e844 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -17,6 +17,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +# to block heavy exception handling that try to acquire the solarmutex +export LO_LEAN_EXCEPTION=1 + include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index a2e621d67215..ebd2a3c86a94 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -8,6 +8,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +# to block heavy exception handling that try to acquire the solarmutex +export LO_LEAN_EXCEPTION=1 + # to avoid flashing windows during tests export VCL_HIDE_WINDOWS=1 |