Skip to content

Commit 2f15958

Browse files
committed
Use new mocha-fivemat-progress-reporter by default instead of dot reporter
1 parent 6405600 commit 2f15958

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

Jakefile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ task("runtests", ["tests", builtLocalDirectory], function() {
562562
colors = process.env.colors || process.env.color
563563
colors = colors ? ' --no-colors ' : ' --colors ';
564564
tests = tests ? ' -g ' + tests : '';
565-
reporter = process.env.reporter || process.env.r || 'dot';
565+
reporter = process.env.reporter || process.env.r || 'mocha-fivemat-progress-reporter';
566566
// timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
567567
// default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
568568
var cmd = host + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"mocha": "latest",
3434
"chai": "latest",
3535
"browserify": "latest",
36-
"istanbul": "latest"
36+
"istanbul": "latest",
37+
"mocha-fivemat-progress-reporter": "latest"
3738
},
3839
"scripts": {
3940
"test": "jake runtests"

src/harness/compilerRunner.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const enum CompilerTestType {
1010

1111
class CompilerBaselineRunner extends RunnerBase {
1212
private basePath = 'tests/cases';
13+
private testSuiteName: string;
1314
private errors: boolean;
1415
private emit: boolean;
1516
private decl: boolean;
@@ -24,16 +25,17 @@ class CompilerBaselineRunner extends RunnerBase {
2425
this.decl = true;
2526
this.output = true;
2627
if (testType === CompilerTestType.Conformance) {
27-
this.basePath += '/conformance';
28+
this.testSuiteName = 'conformance';
2829
}
2930
else if (testType === CompilerTestType.Regressions) {
30-
this.basePath += '/compiler';
31+
this.testSuiteName = 'compiler';
3132
}
3233
else if (testType === CompilerTestType.Test262) {
33-
this.basePath += '/test262';
34+
this.testSuiteName = 'test262';
3435
} else {
35-
this.basePath += '/compiler'; // default to this for historical reasons
36+
this.testSuiteName = 'compiler'; // default to this for historical reasons
3637
}
38+
this.basePath += '/' + this.testSuiteName;
3739
}
3840

3941
public checkTestCodeOutput(fileName: string) {
@@ -384,7 +386,7 @@ class CompilerBaselineRunner extends RunnerBase {
384386
}
385387

386388
public initializeTests() {
387-
describe('Compiler tests', () => {
389+
describe(this.testSuiteName + ' tests', () => {
388390
describe("Setup compiler for compiler baselines", () => {
389391
var harnessCompiler = Harness.Compiler.getCompiler();
390392
this.parseOptions();

src/harness/fourslashRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class FourSlashRunner extends RunnerBase {
3535
this.tests = this.enumerateFiles(this.basePath, /\.ts/i, { recursive: false });
3636
}
3737

38-
describe('Fourslash tests', () => {
38+
describe(this.testSuiteName + ' tests', () => {
3939
this.tests.forEach((fn: string) => {
4040
describe(fn, () => {
4141
fn = ts.normalizeSlashes(fn);

0 commit comments

Comments
 (0)