[Libreoffice-commits] online.git: cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4008c7120d2bf619357f12b23a245df30f3c2d58
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Apr 30 17:42:38 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Apr 30 18:26:34 2020 +0200

    cypress: don't run mobile and desktop tests in parallel.
    
    With the recent mobile detection related changes having
    mobile and dekstop tests running in parallel make the build
    fail.
    
    A related commit:
    255d24ba8fc8669b4197887e69bd4406af4cba14
    
    Change-Id: I69929b5dbd37298e27409d247a651c79f6dbe33f
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93222
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index f206b2803..3e8e5908d 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -59,7 +59,7 @@ $(PID_FILE): @JAILS_PATH@ $(NODE_BINS)
 	$(if $(HEADLESS_BUILD),$(call start_Xvfb),)
 	$(call start_loolwsd)
 
-$(MOBILE_TEST_FILES_DONE): $(PID_FILE)
+$(MOBILE_TEST_FILES_DONE): $(PID_FILE) $(DESKTOP_TEST_FILES_DONE)
 	$(if $(PARALLEL_BUILD),\
 		$(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER)/,,$(basename $@)),$(basename $@).log),\
 		$(call run_mobile_tests))