Makefile.am | 2 +-
configure.ac | 18 ++++++++++++++++++
cypress_test/Makefile.am | 2 ++
cypress_test/README | 6 +++---
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 4bb0372604674d5a27efe8a60c3a34b76a4865a5
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Jan 23 14:48:21 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Thu Jan 23 14:55:50 2020 +0100
cypress: Update README
Change-Id: I98e83a77ae490890aeb515eeb4e03eb18093c694
diff --git a/cypress_test/README b/cypress_test/README
index 62d9f8cb5..8bec5d253 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -3,12 +3,12 @@ Cypress based test framework for LibreOffice Online
Installation
------------------
-In most of the cases you need only cypress npm module
-for running cypress tests. This is installed by the build
+In a normal desktop environment you only need to install npm
+packages for running cypress tests. This is done by the build
system, so running 'make check' will do the basic installation.
https://docs.cypress.io/guides/getting-started/installing-cypress.html#npm-install
-For CI you might need install some additional dependencies:
+For CI you might need to install some additional dependencies:
https://docs.cypress.io/guides/guides/continuous-integration.html#Dependencies
Running tests
commit 0145c03ed6cd7c93f9b09e4e2459a3476ba7b69b
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Jan 23 14:46:07 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Thu Jan 23 14:55:43 2020 +0100
cypress: Introduce an --enable-cypress config option.
Removing the cypress_test subdir from top level
folder made the packaging process to fail.
So better to use a flag to enable cypress tests.
Change-Id: Iead4b7cbbea5c6aaba18c0b85f23d67a4fbe920b
diff --git a/Makefile.am b/Makefile.am
index d17bb8d99..c6d417185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
else
-SUBDIRS = . test loleaflet
+SUBDIRS = . test loleaflet cypress_test
export ENABLE_DEBUG
diff --git a/configure.ac b/configure.ac
index 9f9deba55..6cd517112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,6 +250,10 @@ AC_ARG_ENABLE([werror],
AC_ARG_ENABLE([vereign],
AS_HELP_STRING([--enable-vereign],
[Set Vereign document_signing_url configuration key
to the default app.vereign.com.]))
+
+AC_ARG_ENABLE([cypress],
+ AS_HELP_STRING([--enable-cypress],
+ [Enable cypress tests.]))
# Handle options
AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=d],
@@ -960,6 +964,19 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
])
AC_SUBST(IOSAPP_FONTS)
+ENABLE_CYPRESS=false
+if test "$enable_cypress" = "yes"; then
+ cypress_msg="cypress is enabled"
+ ENABLE_CYPRESS=true
+ AC_DEFINE([ENABLE_CYPRESS],1,[Whether to enable cypress tests])
+else
+ cypress_msg="cypress is disabled"
+ ENABLE_CYPRESS=false
+ AC_DEFINE([ENABLE_CYPRESS],0,[Whether to enable cypress tests])
+fi
+AM_CONDITIONAL([ENABLE_CYPRESS], [$ENABLE_CYPRESS])
+AC_SUBST(ENABLE_CYPRESS)
+
AC_CONFIG_FILES([Makefile
android/app/appSettings.gradle
android/lib/libSettings.gradle
@@ -1043,6 +1060,7 @@ Configuration:
Anonymization $anonym_msg
Set capabilities $setcap_msg
Browsersync $browsersync_msg
+ cypress $cypress_msg
\$ make # to compile"
if test -n "$with_lo_path"; then
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 73c282305..a65395777 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -1,3 +1,4 @@
+if ENABLE_CYPRESS
CYPRESS_BINARY = ${abs_srcdir}/node_modules/cypress/bin/cypress
DESKTOP_TEST_FOLDER = integration_tests/desktop
@@ -106,3 +107,4 @@ clean-local:
rm -rf workdir
rm -rf cypress
rm -rf package-lock.json
+endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
