[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 1f839ca8dc1fa4e8993a965e4025f626e469b481
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 8 20:09:55 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Aug 7 15:46:00 2020 +0200

    cypress: improve error matcher.
    
    Change-Id: I82f209bfb32660723c1a0ec686b8ba363aa612fc
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95854
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 80e6817dcdfb2fcc8ea8d3e11b216d600acee048)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100326

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 0baa0a5f5..907a481c2 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -211,15 +211,17 @@ define run_mobile_tests
 	)
 endef
 
+ERROR_MATCHER = "Error:\|Command failed:\|Timed out retrying"
+
 define execute_run_parallel
 	@mkdir -p $(dir $(2)) && touch $(2) && \
 	echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-	if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
+	if [ -z `grep -o -m 1 $(ERROR_MATCHER) $(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:\|Command failed:" $(2)` ];\
+		     if [ -z `grep -o -m 1 $(ERROR_MATCHER) $(2)` ];\
 			then cat $(2);\
 			else cat $(2) >> $(ERROR_LOG) && \
 			     echo -e $(call error_output_string,$(3),$(4)) >> $(ERROR_LOG); \