[Libreoffice-commits] online.git: cypress_test/Makefile.am

[Henry Castro (via logerrit)]

 cypress_test/Makefile.am |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a420aef10d79bff34e29ebad7162d35aa0367920
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Feb 13 07:57:37 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Feb 13 15:31:04 2020 +0100

    cypress: makefile: fix running specific test
    
    buildir != srcdir
    
    Change-Id: If3f33b546d9c6a95ba214d2d26213ca95fe52e2d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88605
    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 82bfba95b..b4ec01c78 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -1,4 +1,6 @@
 if ENABLE_CYPRESS
+
+abs_dir = $(if $(filter $(abs_builddir),$(abs_srcdir)),.,$(abs_srcdir))
 CYPRESS_BINARY = ${abs_builddir}/node_modules/cypress/bin/cypress
 
 DESKTOP_USER_AGENT = "cypress"
@@ -54,7 +56,7 @@ run-mobile: @JAILS_PATH@ node_modules
 define run_JS_error_check
 	@echo "Checking for JS errors in test code..."
 	@echo
-	@NODE_PATH=$(abs_srcdir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(abs_srcdir) \
+	@NODE_PATH=${abs_dir}/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(abs_srcdir) \
 		--ignore-path $(abs_srcdir)/.eslintignore --config $(abs_top_srcdir)/loleaflet/.eslintrc
 	@echo
 endef
@@ -81,7 +83,7 @@ define run_desktop_tests
 			--config integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \
 			--headless \
 			--env DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \
-			$(if $(1), --spec=integration_tests/desktop/$(1)) \
+			$(if $(1), --spec=${abs_dir}/integration_tests/desktop/$(1)) \
 			|| (pkill loolwsd && false)
 endef
 
@@ -93,7 +95,7 @@ define run_mobile_tests
 			--config integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
 			--headless \
 			--env DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \
-			$(if $(1), --spec=integration_tests/mobile/$(1)) \
+			$(if $(1), --spec=$(abs_dir)/integration_tests/mobile/$(1)) \
 			|| (pkill loolwsd && false)
 endef