configure.ac | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit aaab96fd122c24bde3eed6460e25453fa3d02171
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Jan 23 17:14:09 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Thu Jan 23 21:02:46 2020 +0100
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.zol...@collabora.com>
Tested-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 6cd517112..f56bcab1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
