From fdb66f9e90a4ca212c78ffdaf0279b8f3f3dddd8 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Thu, 26 Oct 2017 11:06:32 -0400 Subject: [PATCH] Merge pull request #11084 from brave/tests/no-pre-push remove unittest from pre-push hook --- package.json | 3 ++- tools/lib/ignoredPaths.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1511e96673c..6e909ad099d 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "flow": "flow; test $? -eq 0 -o $? -eq 2", "lint": "standard", "postinstall": "npm run download-sync-client && webpack", + "pre-push-tests": "if [ -z $NO_PUSH_TESTS ]; then npm run unittest; fi", "start-log": "node ./tools/start.js --user-data-dir-name=brave-development --enable-logging=stderr --v=1 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck", "start": "node ./tools/start.js --user-data-dir-name=brave-development --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck", "start2": "node ./tools/start.js --user-data-dir-name=brave-development-2 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck", @@ -225,7 +226,7 @@ "pre-push": { "run": [ "lint", - "unittest" + "pre-push-tests" ] }, "engineStrict": true, diff --git a/tools/lib/ignoredPaths.js b/tools/lib/ignoredPaths.js index 2949ca6442a..8abc7ba1fb7 100644 --- a/tools/lib/ignoredPaths.js +++ b/tools/lib/ignoredPaths.js @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ module.exports = [ - 'pre-comit', + 'pre-commit', 'pre-push', 'test/', 'docs/',