haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cypress: make chrome check depend on enable_cypress flag. 

Change-Id: I0e61ef55be68991ae6d55247d93beb0cd6913084
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87292
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
distro/collabora/code-4.2.0-4
Tamás Zolnai 2020-01-23 17:14:09 +01:00
parent 1476d914e4
commit aaab96fd12
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -885,10 +885,12 @@ AS_IF([test `uname -s` = "Linux"],
AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
fi
fi
AC_PATH_PROGS(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])
if test "$enable_cypress" = "yes"; then
AC_PATH_PROGS(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
fi
])