diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-30 17:29:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 17:29:56 +0200 |
| commit | 8f90259b02e0c4057229a3cb76fceb9122a388bf (patch) | |
| tree | 386e5e9838ebc8d9697fa499981911423318ef3f | |
| parent | 22746990e6154616b6775fde5ab97c87d6603ed4 (diff) | |
| parent | 1369535d036f2b3d9874569a40a0d5db3f6db1d9 (diff) | |
| download | nextcloud-server-8f90259b02e0c4057229a3cb76fceb9122a388bf.tar.gz nextcloud-server-8f90259b02e0c4057229a3cb76fceb9122a388bf.zip | |
Merge pull request #25304 from owncloud/local-karma
Always use local karma
| -rwxr-xr-x | autotest-js.sh | 14 |
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 |