summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppelsack <hendrik@leppelsack.de>2016-06-29 18:45:13 +0200
committerHendrik Leppelsack <hendrik@leppelsack.de>2016-06-29 18:45:13 +0200
commit1369535d036f2b3d9874569a40a0d5db3f6db1d9 (patch)
tree1c4ece31a70910ed103e85f41c63e886c34bf0df
parent1e1903e4feffb98bde50cf41618d6bb3ef11c88a (diff)
downloadnextcloud-server-1369535d036f2b3d9874569a40a0d5db3f6db1d9.tar.gz
nextcloud-server-1369535d036f2b3d9874569a40a0d5db3f6db1d9.zip
always use local karma
-rwxr-xr-xautotest-js.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/autotest-js.sh b/autotest-js.sh
index 2d8552811cf..475a61df59e 100755
--- a/autotest-js.sh
+++ b/autotest-js.sh
@@ -22,19 +22,7 @@ fi
# update/install test packages
mkdir -p "$PREFIX" && $NPM install --link --prefix "$PREFIX" || exit 3
-KARMA="$(which karma 2>/dev/null)"
-
-# If not installed globally, try local version
-if test -z "$KARMA"
-then
- KARMA="$PREFIX/node_modules/karma/bin/karma"
-fi
-
-if test -z "$KARMA"
-then
- echo 'Karma module executable not found' >&2
- exit 2
-fi
+KARMA="$PREFIX/node_modules/karma/bin/karma"
NODE_PATH='build/node_modules' KARMA_TESTSUITE="$1" $KARMA start tests/karma.config.js --single-run