From 7473c654d5afdf62bd5e460df4b68eebe88e5cb9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 11 Jul 2017 22:54:18 +0100
Subject: [PATCH] use npm scripts arg passing instead of $KARMAFLAGS to make
 cross-compat

---
 jenkins.sh   | 3 +--
 package.json | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jenkins.sh b/jenkins.sh
index d9bb62855b..a0e8d2e893 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-export KARMAFLAGS="--no-colors"
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 nvm use 4
@@ -16,7 +15,7 @@ npm install
 (cd node_modules/matrix-js-sdk && npm install)
 
 # run the mocha tests
-npm run test
+npm run test -- --no-colors
 
 # run eslint
 npm run lintall -- -f checkstyle -o eslint.xml || true
diff --git a/package.json b/package.json
index 0f114bf63d..439fc30465 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,8 @@
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib",
     "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt",
-    "test": "karma start $KARMAFLAGS --single-run=true --browsers ChromeHeadless",
-    "test-multi": "karma start $KARMAFLAGS"
+    "test": "karma start --single-run=true --browsers ChromeHeadless",
+    "test-multi": "karma start"
   },
   "dependencies": {
     "babel-runtime": "^6.11.6",