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: Iead4b7cbbea5c6aaba18c0b85f23d67a4fbe920bdistro/collabora/code-4.2.0-4
parent
9f91b01633
commit
0145c03ed6
|
@ -14,7 +14,7 @@ endif
|
|||
|
||||
else
|
||||
|
||||
SUBDIRS = . test loleaflet
|
||||
SUBDIRS = . test loleaflet cypress_test
|
||||
|
||||
export ENABLE_DEBUG
|
||||
|
||||
|
|
18
configure.ac
18
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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue