[Libreoffice-commits] online.git: cypress_test/Makefile.am

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Tue Mar 10 13:57:09 UTC 2020


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

New commits:
commit ae759479f723bc4f3a64ba89da68c803692ce931
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Mar 10 13:49:21 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Mar 10 14:56:51 2020 +0100

    cypress: better way to find out test failure.
    
    Change-Id: I2a398714976f65977cc64490206e7e57c1da5d86
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90256
    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 84d7c19a6..ff1885dcc 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -196,9 +196,9 @@ endef
 define execute_run_parallel
 	@mkdir -p $(dir $(2)) && touch $(2) && \
 	echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-	if [ `grep -o "CypressError" $(2)` ];\
-		then cat $(2) >> $(ERROR_LOG);\
-		else cat $(2);\
+	if [ -z `grep -o -m 1 "CypressError" $(2)` ];\
+		then cat $(2);\
+		else cat $(2) >> $(ERROR_LOG);\
 	fi;
 endef
 


More information about the Libreoffice-commits mailing list