aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tslint/lib/runner.js
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/tslint/lib/runner.js')
-rw-r--r--node_modules/tslint/lib/runner.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/node_modules/tslint/lib/runner.js b/node_modules/tslint/lib/runner.js
index 0bcf5b9ed..d8d138a7f 100644
--- a/node_modules/tslint/lib/runner.js
+++ b/node_modules/tslint/lib/runner.js
@@ -26,7 +26,6 @@ var ts = require("typescript");
var configuration_1 = require("./configuration");
var error_1 = require("./error");
var Linter = require("./linter");
-var test_1 = require("./test");
var utils_1 = require("./utils");
function run(options, logger) {
return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -52,7 +51,7 @@ function run(options, logger) {
exports.run = run;
function runWorker(options, logger) {
return tslib_1.__awaiter(this, void 0, void 0, function () {
- var results, _a, output, errorCount;
+ var test_1, results, _a, output, errorCount;
return tslib_1.__generator(this, function (_b) {
switch (_b.label) {
case 0:
@@ -63,17 +62,22 @@ function runWorker(options, logger) {
fs.writeFileSync(configuration_1.CONFIG_FILENAME, JSON.stringify(configuration_1.DEFAULT_CONFIG, undefined, " "));
return [2 /*return*/, 0 /* Ok */];
}
- if (options.test) {
- results = test_1.runTests((options.files || []).map(trimSingleQuotes), options.rulesDirectory);
- return [2 /*return*/, test_1.consoleTestResultsHandler(results) ? 0 /* Ok */ : 1 /* FatalError */];
- }
+ if (!options.test) return [3 /*break*/, 2];
+ return [4 /*yield*/, Promise.resolve().then(function () { return require("./test"); })];
+ case 1:
+ test_1 = _b.sent();
+ results = test_1.runTests((options.files || []).map(trimSingleQuotes), options.rulesDirectory);
+ return [2 /*return*/, test_1.consoleTestResultsHandler(results) ? 0 /* Ok */ : 1 /* FatalError */];
+ case 2:
if (options.config && !fs.existsSync(options.config)) {
throw new error_1.FatalError("Invalid option for configuration: " + options.config);
}
return [4 /*yield*/, runLinter(options, logger)];
- case 1:
+ case 3:
_a = _b.sent(), output = _a.output, errorCount = _a.errorCount;
- logger.log(output);
+ if (output && output.trim()) {
+ logger.log(output);
+ }
return [2 /*return*/, options.force || errorCount === 0 ? 0 /* Ok */ : 2 /* LintError */];
}
});