cypress_test/Makefile.am | 2 +- cypress_test/README | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit 558bf487ed58c45115b8b6124105798d19b5a284 Author: Tamás Zolnai <[email protected]> AuthorDate: Wed Jun 3 12:44:31 2020 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Wed Jun 3 13:10:53 2020 +0200 cypress: workaround cypress issue with absolute path and symlinks. https://github.com/cypress-io/cypress/issues/3482 Absolute path was introduced for that case when somebody uses a separate builddir. However cypress has an issue with absolute path. Let's avoid this issue when builddir and sourcedir are the same. Change-Id: Ic825d0abba86cafb1e243da510fd1aefb77575a6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95406 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 58c5c0677..ba75d9a15 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -12,7 +12,7 @@ NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed PID_FILE=$(abs_builddir)/workdir/loolwsd.pid ERROR_LOG=$(abs_builddir)/workdir/error.log -SUPPORT_FILE = $(abs_srcdir)/support/index.js +SUPPORT_FILE = $(if $(findstring $(abs_srcdir),$(abs_builddir)),support/index.js,$(abs_srcdir)/support/index.js) DESKTOP_USER_AGENT = "cypress" DESKTOP_TEST_FOLDER = $(abs_srcdir)/integration_tests/desktop diff --git a/cypress_test/README b/cypress_test/README index 1b8b88b27..9f86196c0 100644 --- a/cypress_test/README +++ b/cypress_test/README @@ -114,3 +114,17 @@ We are using different configuration and environment variables for mobile and desktop tests, that's why there are two separate commands for them and there is no option to open all the tests in the test runner. + +Known issues +------------ + +1. Different builddir and sourcedir with symlinks. + +Cypress has an issue with symlinks: +https://github.com/cypress-io/cypress/issues/3482 + +We use the related feature only when the build directory +is different from the source directory. So to avoid this +issue with the supportFile, you should build in the source +directory or you should avoid symlinks in the path of the +build directory. _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
