cypress_test/Makefile.am | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
New commits: commit 88602be6f37b493a583aaddf810220562df6f550 Author: Tamás Zolnai <[email protected]> AuthorDate: Fri Feb 28 14:37:56 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Fri Feb 28 18:26:25 2020 +0100 parallel-cypress: restore original sequential build. Running all tests in one command will display a better output and also might be faster. Change-Id: Ib061fad28eeb1246c774bfb7fd958c3f5b9c317b Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89731 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 8caf63453..6be7830eb 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -57,7 +57,7 @@ MOBILE_TEST_FILES_DONE= \ DESKTOP_TEST_FILES_DONE= \ $(foreach test_file,$(DEKSTOP_TEST_FILES),$(DESKTOP_TRACK_FOLDER)/$(test_file).done) -check-local: $(MOBILE_TEST_FILES_DONE) $(DESKTOP_TEST_FILES_DONE) +check-local: $(DESKTOP_TEST_FILES_DONE) $(MOBILE_TEST_FILES_DONE) @$(KILL_COMMAND) || true $(if $(HEADLESS_BUILD),@pkill Xvfb,) @@ -67,14 +67,22 @@ $(PID_FILE): @JAILS_PATH@ $(NODE_BINS) $(call start_loolwsd) $(MOBILE_TEST_FILES_DONE): $(PID_FILE) - $(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER),,$(basename $@))) + $(if $(PARALLEL_BUILD),\ + $(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER),,$(basename $@))),\ + $(call run_mobile_tests)) @mkdir -p $(dir $@) - @touch $@ + $(if $(PARALLEL_BUILD),\ + @touch $@,\ + $(foreach done_file,$(MOBILE_TEST_FILES_DONE),touch $(done_file) &&) true) $(DESKTOP_TEST_FILES_DONE): $(PID_FILE) - $(call run_desktop_tests,$(subst $(DESKTOP_TRACK_FOLDER),,$(basename $@))) + $(if $(PARALLEL_BUILD),\ + $(call run_desktop_tests,$(subst $(DESKTOP_TRACK_FOLDER),,$(basename $@))),\ + $(call run_desktop_tests)) @mkdir -p $(dir $@) - @touch $@ + $(if $(PARALLEL_BUILD),\ + @touch $@,\ + $(foreach done_file,$(DESKTOP_TEST_FILES_DONE),touch $(done_file) &&) true) check-seq: @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) commit 2aed995559baf111d43c8f906551b1120087933f Author: Yunusemre Şentürk <[email protected]> AuthorDate: Fri Feb 28 19:17:08 2020 +0300 Commit: Tamás Zolnai <[email protected]> CommitDate: Fri Feb 28 18:26:17 2020 +0100 Wait until Xvfb says it is ready Change-Id: I3af4428802d6e0ee380536e8dbad1de8aa6d9337 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89727 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 92d40a364..8caf63453 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -146,7 +146,7 @@ endef define start_Xvfb @echo "Launching Xvfb..." Xvfb :$(DISPLAY_NUMBER) & - sleep 10 + while [ ! -f /tmp/.X$(DISPLAY_NUMBER)-lock ] ; do sleep 1; done @echo endef _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
