From 1d066b768f7e7176a8b8c937f6d927cf3a647a5c Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Tue, 8 Apr 2014 22:01:46 +0200 Subject: [PATCH] Removes custom test/reporter.js from the lint process --- make.js | 9 ++++----- test/reporter.js | 47 ----------------------------------------------- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 test/reporter.js diff --git a/make.js b/make.js index ae39c7ca6..ae664f202 100644 --- a/make.js +++ b/make.js @@ -1274,7 +1274,6 @@ target.lint = function() { 'web/', 'test/downloadutils.js', 'test/driver.js', - 'test/reporter.js', 'test/test.js', 'test/testutils.js', 'test/webbrowser.js', @@ -1292,10 +1291,10 @@ target.lint = function() { exec('npm install jshint@2.4.x'); // TODO read version from package.json } - exit(exec('"' + jshintPath + '" --reporter test/reporter.js ' + - LINT_FILES.join(' ')).code); - - crlfchecker.checkIfCrlfIsPresent(LINT_FILES); + var exitCode = exec('"' + jshintPath + '" ' + LINT_FILES.join(' ')).code; + if (exitCode === 0) { + echo('files checked, no errors found'); + } }; // diff --git a/test/reporter.js b/test/reporter.js deleted file mode 100644 index cd56bef38..000000000 --- a/test/reporter.js +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ -/* Copyright 2012 Mozilla Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* jshint node:true */ - -'use strict'; - -module.exports = { - reporter: function reporter(res) { - var len = 0; - var str = ''; - - res.forEach(function(r) { - var file = r.file; - var err = r.error; - - switch (err.code) { - default: - len++; - str += file + ': line ' + err.line + ', col ' + - err.character + ', ' + err.reason + '\n'; - } - }); - - if (str) { - process.stdout.write(str + '\n' + len + ' error' + - ((len === 1) ? '' : 's') + '\n'); - process.exit(2); - } else { - process.stdout.write('files checked, no errors found\n'); - process.exit(0); - } - } -};