microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-29 16:29:19 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into remove-jake

Browse Source
This commit is contained in:
Wesley Wigham
2016-06-14 14:52:02 -07:00
parent 2ff408fb95 7890fd58b9
commit 2634a6713e
155 changed files with 1804 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mocha-parallel.js
View File

@@ -193,7 +193,6 @@ function runTests(taskConfigsFolder, run, options, cb) {
counter--;
if (counter <= 0) {
var failed = 0;
var reporter = new Base(),
stats = reporter.stats,
failures = reporter.failures;
@@ -224,8 +223,8 @@ function runTests(taskConfigsFolder, run, options, cb) {
reporter.epilogue();
}
if (failed) {
return cb(new Error("Test failures reported: " + failed));
if (stats.failures) {
return cb(new Error("Test failures reported: " + stats.failures));
}
else {
return cb();