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

New commits:
commit a99a13b588e0a2fdc0c54980a00fcdb8598e2ebd
Author:     Tamás Zolnai <[email protected]>
AuthorDate: Sat Feb 29 14:19:25 2020 +0100
Commit:     Tamás Zolnai <[email protected]>
CommitDate: Sat Feb 29 15:09:24 2020 +0100

    simplify this
    
    Change-Id: I49d68b486e83bb0d0afaedb16860474c4d7eebe8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89757
    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 db4d87731..29285e3f3 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -71,11 +71,9 @@ $(MOBILE_TEST_FILES_DONE): $(PID_FILE)
                $(call run_mobile_tests,$(subst 
$(MOBILE_TRACK_FOLDER)/,,$(basename $@))),\
                $(call run_mobile_tests))
        $(if $(PARALLEL_BUILD),\
-               @mkdir -p $(dir $@) &&\
-               touch $@\
+               @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\
+               @$(foreach done_file,$(MOBILE_TEST_FILES_DONE),mkdir -p $(dir 
$(done_file)) && touch $(done_file) &&) true\
        )
 
 $(DESKTOP_TEST_FILES_DONE): $(PID_FILE)
@@ -83,11 +81,9 @@ $(DESKTOP_TEST_FILES_DONE): $(PID_FILE)
                $(call run_desktop_tests,$(subst 
$(DESKTOP_TRACK_FOLDER)/,,$(basename $@))),\
                $(call run_desktop_tests))
        $(if $(PARALLEL_BUILD),\
-               @mkdir -p $(dir $@) &&\
-               touch $@\
+               @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\
+               @$(foreach done_file,$(DESKTOP_TEST_FILES_DONE),mkdir -p $(dir 
$(done_file)) && touch $(done_file) &&) true\
        )
 
 check-seq: @JAILS_PATH@ $(NODE_BINS)
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to