cypress_test/Makefile.am | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
New commits: commit 75de3743cde9f2f621070e5b19d952ac705a2ee0 Author: Tamás Zolnai <[email protected]> AuthorDate: Sat Feb 22 11:48:33 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Sat Feb 22 13:20:17 2020 +0100 cypress: during parallel build don't write out execution line-by-line Because in this case the different threads output will be mixed in the command line. For sequential build keep the original behavior. Change-Id: Ibf9bf7c6111f8b5b0cf188fab66b97dedd613c65 diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index ba4bed9d4..f5df78c00 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -22,6 +22,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)) if HAVE_LO_PATH MOBILE_TEST_FILES= \ @@ -129,27 +130,29 @@ define start_loolwsd endef define run_desktop_tests + @echo $(if $(1),"Running cypress desktop test: $(1)","Running cypress desktop tests...") @echo - @echo "Running cypress desktop tests..." - @echo - $(CYPRESS_BINARY) run --browser $(CHROME) \ + $(eval RUN_COMMAND = \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \ --headless \ --env DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT) \ $(if $(1), --spec=${abs_dir}/integration_tests/desktop/$(1)) \ - || ($(KILL_COMMAND) && false) + || ($(KILL_COMMAND) && false)) + $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) && $(RUN_COMMAND)`",$(RUN_COMMAND)) endef define run_mobile_tests + @echo $(if $(1),"Running cypress mobile test: $(1)","Running cypress mobile tests...") @echo - @echo "Running cypress mobile tests..." - @echo - $(CYPRESS_BINARY) run --browser $(CHROME) \ + $(eval RUN_COMMAND = \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \ --headless \ --env DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT) \ $(if $(1), --spec=$(abs_dir)/integration_tests/mobile/$(1)) \ - || ($(KILL_COMMAND) && false) + || ($(KILL_COMMAND) && false)) + $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) && $(RUN_COMMAND)`",$(RUN_COMMAND)) endef NODE_BINS = \ commit e6c7f9fde90e08947b5272df9d067ff139ff36b6 Author: Tamás Zolnai <[email protected]> AuthorDate: Sat Feb 22 10:42:49 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Sat Feb 22 12:54:39 2020 +0100 cypress: some cleanup around loolwsd server starting Change-Id: Ia762d9ae73a40ea9debf0b847bc93e8e9171284d diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index ed59bcf5c..ba4bed9d4 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -57,7 +57,6 @@ check-local: $(MOBILE_TEST_FILES_DONE) $(DESKTOP_TEST_FILES_DONE) $(PID_FILE): @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) - $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))) $(call start_loolwsd) $(MOBILE_TEST_FILES_DONE): $(PID_FILE) @@ -111,6 +110,7 @@ define run_JS_error_check endef define start_loolwsd + $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))) @echo "Found available port for testing: $(FREE_PORT)" @echo @echo "Launching loolwsd..." @@ -120,9 +120,10 @@ define start_loolwsd --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --disable-ssl \ --o:admin_console.username=admin --o:admin_console.password=admin \ - --o:logging.file[@enable]=true --o:logging.level=trace > /dev/null 2>&1 \ + --o:logging.file[@enable]=true --o:logging.level=trace \ --port=$(FREE_PORT) \ - --pidfile=$(PID_FILE) & + --pidfile=$(PID_FILE) \ + > /dev/null 2>&1 & @$(WAIT_ON_BINARY) http://localhost:$(FREE_PORT) --timeout 60000 @echo endef _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
