[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 aeb48c3ad53bb0cd8d2897063bc326c22f4d5682
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Apr 7 12:02:08 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Apr 7 12:40:16 2020 +0200

    cypress: Catch any "Error:" in log.
    
    Change-Id: Ia82f896e7ff4299e25ac38283f0e518bef25f875
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91808
    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 b965fe298..73ce55751 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -204,7 +204,7 @@ endef
 define execute_run_parallel
 	@mkdir -p $(dir $(2)) && touch $(2) && \
 	echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-	if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught TypeError\|Error: Timed out retrying" $(2)` ];\
+	if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught TypeError\|Error: " $(2)` ];\
 		then cat $(2);\
 		else cat $(2) >> $(ERROR_LOG);\
 	fi;