[Libreoffice-commits] online.git: cypress_test/Makefile.am
Henry Castro (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 13 14:30:09 UTC 2020
cypress_test/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c2de19b368e8074b01b1eb264b6e6b38f4f1515f
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 12 14:41:41 2020 -0400
Commit: Henry Castro <hcastro at collabora.com>
CommitDate: Thu Feb 13 15:29:51 2020 +0100
cypress: makefile: fix build dir expansion
builddir != srcdir
Change-Id: I8243fb28782bbe123b65ec86a36770323092b9f8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88561
Tested-by: Henry Castro <hcastro at collabora.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 8cf139647..82bfba95b 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -1,13 +1,13 @@
if ENABLE_CYPRESS
-CYPRESS_BINARY = ${abs_srcdir}/node_modules/cypress/bin/cypress
+CYPRESS_BINARY = ${abs_builddir}/node_modules/cypress/bin/cypress
DESKTOP_USER_AGENT = "cypress"
-DESKTOP_TEST_FOLDER = integration_tests/desktop
+DESKTOP_TEST_FOLDER = ${abs_srcdir}/integration_tests/desktop
DESKTOP_DATA_FOLDER = ${abs_srcdir}/data/desktop/
DESKTOP_WORKDIR = ${abs_srcdir}/workdir/desktop/
MOBILE_USER_AGENT = "cypress mobile"
-MOBILE_TEST_FOLDER = integration_tests/mobile
+MOBILE_TEST_FOLDER = ${abs_srcdir}/integration_tests/mobile
MOBILE_DATA_FOLDER = ${abs_srcdir}/data/mobile/
MOBILE_WORKDIR = ${abs_srcdir}/workdir/mobile/
More information about the Libreoffice-commits
mailing list