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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit a89c8ff508c32a91011d0a0530b0c08a913955ae
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sun May 10 11:27:43 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 17:18:55 2020 +0200

    cypress: catch also "Command failed:" as an error.
    
    Change-Id: Ie5649886eabf3994ba003dc9e7b9b28790c1a58b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93917
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 057276267..50b2ae4c3 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -185,12 +185,12 @@ endef
 define execute_run_parallel
 	@mkdir -p $(dir $(2)) && touch $(2) && \
 	echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-	if [ -z `grep -o -m 1 "Error:" $(2)` ];\
+	if [ -z `grep -o -m 1 "Error:\|Command failed:" $(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:" $(2)` ];\
+		     if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
 			then cat $(2);\
 			else cat $(2) >> $(ERROR_LOG)&& \
 			     echo "" >> $(ERROR_LOG) && \
commit 51ff4db16faec8c5d1ce08862fb9f4fd292b4b9c
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sun May 10 12:08:07 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 17:18:41 2020 +0200

    cypress: start Xvfb with screen argument.
    
    It fixes an error during cypress verify:
    https://github.com/cypress-io/cypress/issues/6184
    
    Change-Id: I993bf6cda5f8018d394ee6ee506f99d07b1e6e56
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93926
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 3e8e5908d..057276267 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -143,7 +143,7 @@ endef
 #https://docs.cypress.io/guides/guides/continuous-integration.html#Xvfb
 define start_Xvfb
 	@echo "Launching Xvfb..."
-	Xvfb :$(DISPLAY_NUMBER) &
+	Xvfb :$(DISPLAY_NUMBER) -screen 0 1280x800x24 &
 	while [ ! -f /tmp/.X$(DISPLAY_NUMBER)-lock ] ; do sleep 1; done
 	@echo
 endef