cypress_test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 8c6bc949da15782982fdd825a0375ce7a4077fa0 Author: Tamás Zolnai <[email protected]> AuthorDate: Sat Mar 14 20:42:48 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Sat Mar 14 22:04:32 2020 +0100 cypress: better parallel build detection. Now it works both with '-j' and with '-j <number>'. Change-Id: I41ebace6fd799f103ce557a8cf8419fea786faca Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90496 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index fb209bf1f..f3ad18904 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -24,7 +24,7 @@ MOBILE_TRACK_FOLDER=$(abs_builddir)/workdir/track/mobile ALLOWED_PORTS = $(shell seq 9900 1 9980) KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE) -PARALLEL_BUILD = $(findstring jobserver,$(MAKEFLAGS)) +PARALLEL_BUILD = $(findstring -j,$(MAKEFLAGS)) DISPLAY_NUMBER = 100 HEADLESS_BUILD := $(findstring Command failed,$(shell xhost > /dev/null 2>&1 || echo "Command failed, so we are in a headless environment.")) export DISPLAY=$(if $(HEADLESS_BUILD),:$(DISPLAY_NUMBER),$(shell echo $$DISPLAY)) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
