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

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Sun May 10 10:45:46 UTC 2020


 cypress_test/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84f46074f9765f6b3e190831b49c448ca26596a4
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sun May 10 12:08:07 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sun May 10 12:45:28 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/+/93793
    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 f60453ac8..50b2ae4c3 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


More information about the Libreoffice-commits mailing list