cypress_test/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 50d4451c2100fb8b23381bb46b4e66b644c5de86
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Sun May 10 11:27:43 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sun May 10 12:15:46 2020 +0200
cypress: catch also "Command failed:" as an error.
Change-Id: Ie5649886eabf3994ba003dc9e7b9b28790c1a58b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93925
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 3e8e5908d..f60453ac8 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -185,12 +185,12 @@ endef
define execute_run_parallel
@mkdir -p $(dir $(2)) && touch $(2) && \
echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
- if [ -z `grep -o -m 1 "Error:" $(2)` ];\
+ if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
then cat $(2);\
elif [ -z $(CYPRESS_NO_SECOND_CHANCE) ]; \
then echo "Second chance!" > $(2) && \
echo "`echo $(1) && $(1)`" >> $(2) 2>&1 && \
- if [ -z `grep -o -m 1 "Error:" $(2)` ];\
+ if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
then cat $(2);\
else cat $(2) >> $(ERROR_LOG)&& \
echo "" >> $(ERROR_LOG) && \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
