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

[Miklos Vajna (via logerrit)]

 configure.ac             |    5 +++++
 cypress_test/Makefile.am |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ed586d96011740b87e812a54632bd16ac954a7d1
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jan 22 14:57:31 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jan 22 18:59:46 2020 +0100

    cypress: accept chromium next to chrome
    
    Change-Id: Id2a577b1413227840e2af29abe4cc96e5a81dd82
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87191
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/configure.ac b/configure.ac
index f502934ae..4e0087071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -881,6 +881,11 @@ AS_IF([test `uname -s` = "Linux"],
                AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
            fi
        fi
+       AC_PATH_PROG(CHROME, chrome, google-chrome, chromium, no)
+       if test "$CHROME" = "no"; then
+           # Only a warning till these tests are not part of toplevel 'make check'.
+           AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed])
+       fi
        ])
 
 # need this after the other stuff that uses the compiler because we don't want to run configure-tests with the plugins enabled
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 26fb9a0bd..73c282305 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -75,7 +75,7 @@ define run_desktop_tests
 	@echo
 	@echo "Running cypress desktop tests..."
 	@echo
-	$(CYPRESS_BINARY) run --browser chrome \
+	$(CYPRESS_BINARY) run --browser $(CHROME) \
 			--config integrationFolder=$(DESKTOP_TEST_FOLDER) \
 			--headless \
 			--env DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \
@@ -87,7 +87,7 @@ define run_mobile_tests
 	@echo
 	@echo "Running cypress mobile tests..."
 	@echo
-	$(CYPRESS_BINARY) run --browser chrome \
+	$(CYPRESS_BINARY) run --browser $(CHROME) \
 			--config integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
 			--headless \
 			--env DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \