[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 bdef8193b8b0a500091efc47ab6986459e83d0db
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Apr 8 10:44:16 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Apr 8 11:24:38 2020 +0200

    cypress: simplify output error matcher.
    
    Change-Id: I18392d8aabd9f3f4ba43139f9e951faead8b9667
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91876
    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 b9129753c..6925f2721 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -206,7 +206,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: " $(2)` ];\
+	if [ -z `grep -o -m 1 "Error:" $(2)` ];\
 		then cat $(2);\
 		else cat $(2) >> $(ERROR_LOG);\
 	fi;