[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 6e96d4f6dfb8bafd38c846394ce545224164df3b
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Mar 18 22:05:36 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Mar 19 12:30:54 2020 +0100

    cypress: catch "Uncaught TypeError" error in the log.
    
    During parallel build.
    
    Change-Id: I18d78250650e5d16ff9a4ff8588a2e955a934f44
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90721
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index d712c5296..603ec9269 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -198,7 +198,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" $(2)` ];\
+	if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught TypeError" $(2)` ];\
 		then cat $(2);\
 		else cat $(2) >> $(ERROR_LOG);\
 	fi;