From b0c77a61c5c51ec3070d7b85f8e4fe32f36e5799 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Fri, 24 Oct 2014 14:50:27 -0400 Subject: [PATCH] Enable/disable NODE_PATH through build.xml. --- build.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index c280d81d1d0..7af6d583120 100644 --- a/build.xml +++ b/build.xml @@ -6,6 +6,7 @@ <property name="srcdir" value="${project.basedir}" override="true" /> <property name="apacheconfdir" value="/etc/apache2/conf.d" /> <property name="apachectl" value="false" /><!-- set to apachectl path to spin up Apache instance --> + <property name="nodepath" value="" /><!-- set to node.js modules path to use Zombie.js testing --> <property name="vufindurl" value="http://localhost/vufind" /> <property name="vufinddb" value="vufind_test" /> <property name="vufinddbuser" value="vufindtest" /> @@ -88,12 +89,12 @@ <!-- PHPUnit --> <target name="phpunit" description="Run tests"> - <exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" /> + <exec dir="${srcdir}/module/VuFind/tests" command="NODE_PATH=${nodepath} VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" /> </target> <!-- PHPUnit without logging output --> <target name="phpunitfast" description="Run tests"> - <exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0" passthru="true" checkreturn="true" /> + <exec dir="${srcdir}/module/VuFind/tests" command="NODE_PATH=${nodepath} VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0" passthru="true" checkreturn="true" /> </target> <!-- Install and Activate VuFind --> -- GitLab