Skip to content

Commit 93510e8

Browse files
committed
Merge pull request microsoft#7451 from Microsoft/runtest-parallel-runs-lint
Always run lint, even for runtests-parallel
2 parents 05baf3d + 8a01a97 commit 93510e8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Jakefile.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ function deleteTemporaryProjectOutput() {
652652
}
653653
}
654654

655-
function runConsoleTests(defaultReporter, defaultSubsets, postLint) {
655+
function runConsoleTests(defaultReporter, defaultSubsets) {
656656
cleanTestDirs();
657657
var debug = process.env.debug || process.env.d;
658658
tests = process.env.test || process.env.tests || process.env.t;
@@ -685,13 +685,13 @@ function runConsoleTests(defaultReporter, defaultSubsets, postLint) {
685685
subsetRegexes = subsets.map(function (sub) { return "^" + sub + ".*$"; });
686686
subsetRegexes.push("^(?!" + subsets.join("|") + ").*$");
687687
}
688-
subsetRegexes.forEach(function (subsetRegex) {
688+
subsetRegexes.forEach(function (subsetRegex, i) {
689689
tests = subsetRegex ? ' -g "' + subsetRegex + '"' : '';
690690
var cmd = "mocha" + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
691691
console.log(cmd);
692692
exec(cmd, function () {
693693
deleteTemporaryProjectOutput();
694-
if (postLint) {
694+
if (i === 0) {
695695
var lint = jake.Task['lint'];
696696
lint.addListener('complete', function () {
697697
complete();
@@ -713,7 +713,7 @@ task("runtests-parallel", ["build-rules", "tests", builtLocalDirectory], functio
713713

714714
desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false.");
715715
task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
716-
runConsoleTests('mocha-fivemat-progress-reporter', [], /*postLint*/ true);
716+
runConsoleTests('mocha-fivemat-progress-reporter', []);
717717
}, {async: true});
718718

719719
desc("Generates code coverage data via instanbul");

0 commit comments

Comments
 (0)