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

[Henry Castro (via logerrit)]

 configure.ac             |    2 ++
 cypress_test/Makefile.am |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e6f5917812ea078bb8a2e279057648175e631b70
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue May 12 15:29:08 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed May 13 16:51:29 2020 +0200

    cypress: fix error running single unit test
    
    builddir != srcdir
    
    Change-Id: I2521c3e11f05f0c91bf0e8f5667a5466493acac0
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94080
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/configure.ac b/configure.ac
index ae72b9d13..f3a13a3ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -999,6 +999,8 @@ AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json])
 AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json])
 AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins])
 AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages])
+AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin])
+AC_LINK_FILES([cypress_test/support], [cypress_test/support])
 
 APP_BRANDING_DIR=
 APP_IC_LAUNCHER="ic_launcher"
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 50b2ae4c3..158016d5f 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -1,5 +1,7 @@
 if ENABLE_CYPRESS
 
+export NODE_PATH=$(abs_builddir)/node_modules
+
 abs_dir = $(if $(filter $(abs_builddir),$(abs_srcdir)),.,$(abs_srcdir))
 CYPRESS_BINARY = $(abs_builddir)/node_modules/cypress/bin/cypress
 ESLINT_BINARY = $(abs_builddir)/node_modules/eslint/bin/eslint.js
@@ -116,7 +118,7 @@ run-mobile: @JAILS_PATH@ $(NODE_BINS)
 define run_JS_error_check
 	@echo "Checking for JS errors in test code..."
 	@echo
-	@NODE_PATH=$(abs_dir)/node_modules $(NODE) $(ESLINT_BINARY) $(abs_srcdir) \
+	@$(NODE) $(ESLINT_BINARY) $(abs_srcdir) \
 		--ignore-path $(abs_srcdir)/.eslintignore --config $(abs_srcdir)/.eslintrc
 	@echo
 endef