[Libreoffice-commits] online.git: Branch 'feature/parallel_cypress' - cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit c85a9fc5a24fd1a342675308343ce92fb55438eb
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Feb 28 21:02:09 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Feb 28 21:27:22 2020 +0100

    fix sequential build
    
    Change-Id: I09d92458109c279380b1425b323b52c55b8f348b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89749
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 6be7830eb..ae3df12ad 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -70,19 +70,25 @@ $(MOBILE_TEST_FILES_DONE): $(PID_FILE)
 	$(if $(PARALLEL_BUILD),\
 		$(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER),,$(basename $@))),\
 		$(call run_mobile_tests))
-	@mkdir -p $(dir $@)
 	$(if $(PARALLEL_BUILD),\
-		@touch $@,\
-		$(foreach done_file,$(MOBILE_TEST_FILES_DONE),touch $(done_file) &&) true)
+		@mkdir -p $(dir $@) &&\
+		touch $@\
+		,\
+		@$(foreach done_file,$(MOBILE_TEST_FILES_DONE),mkdir -p $(dir $(done_file)) &&)\
+		$(foreach done_file,$(MOBILE_TEST_FILES_DONE),touch $(done_file) &&) true\
+	)
 
 $(DESKTOP_TEST_FILES_DONE): $(PID_FILE)
 	$(if $(PARALLEL_BUILD),\
 		$(call run_desktop_tests,$(subst $(DESKTOP_TRACK_FOLDER),,$(basename $@))),\
 		$(call run_desktop_tests))
-	@mkdir -p $(dir $@)
 	$(if $(PARALLEL_BUILD),\
-		@touch $@,\
-		$(foreach done_file,$(DESKTOP_TEST_FILES_DONE),touch $(done_file) &&) true)
+		@mkdir -p $(dir $@) &&\
+		touch $@\
+		,\
+		@$(foreach done_file,$(DESKTOP_TEST_FILES_DONE),mkdir -p $(dir $(done_file)) &&)\
+		$(foreach done_file,$(DESKTOP_TEST_FILES_DONE),touch $(done_file) &&) true\
+	)
 
 check-seq: @JAILS_PATH@ $(NODE_BINS)
 	$(call run_JS_error_check)