Use new mocha-fivemat-progress-reporter by default instead of dot reporter
This commit is contained in:
Родитель
64056005ff
Коммит
2f15958d32
|
@ -562,7 +562,7 @@ task("runtests", ["tests", builtLocalDirectory], function() {
|
|||
colors = process.env.colors || process.env.color
|
||||
colors = colors ? ' --no-colors ' : ' --colors ';
|
||||
tests = tests ? ' -g ' + tests : '';
|
||||
reporter = process.env.reporter || process.env.r || 'dot';
|
||||
reporter = process.env.reporter || process.env.r || 'mocha-fivemat-progress-reporter';
|
||||
// timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
|
||||
// default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
|
||||
var cmd = host + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
|
||||
|
|
|
@ -33,7 +33,8 @@
|
|||
"mocha": "latest",
|
||||
"chai": "latest",
|
||||
"browserify": "latest",
|
||||
"istanbul": "latest"
|
||||
"istanbul": "latest",
|
||||
"mocha-fivemat-progress-reporter": "latest"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "jake runtests"
|
||||
|
|
|
@ -10,6 +10,7 @@ const enum CompilerTestType {
|
|||
|
||||
class CompilerBaselineRunner extends RunnerBase {
|
||||
private basePath = 'tests/cases';
|
||||
private testSuiteName: string;
|
||||
private errors: boolean;
|
||||
private emit: boolean;
|
||||
private decl: boolean;
|
||||
|
@ -24,16 +25,17 @@ class CompilerBaselineRunner extends RunnerBase {
|
|||
this.decl = true;
|
||||
this.output = true;
|
||||
if (testType === CompilerTestType.Conformance) {
|
||||
this.basePath += '/conformance';
|
||||
this.testSuiteName = 'conformance';
|
||||
}
|
||||
else if (testType === CompilerTestType.Regressions) {
|
||||
this.basePath += '/compiler';
|
||||
this.testSuiteName = 'compiler';
|
||||
}
|
||||
else if (testType === CompilerTestType.Test262) {
|
||||
this.basePath += '/test262';
|
||||
this.testSuiteName = 'test262';
|
||||
} else {
|
||||
this.basePath += '/compiler'; // default to this for historical reasons
|
||||
this.testSuiteName = 'compiler'; // default to this for historical reasons
|
||||
}
|
||||
this.basePath += '/' + this.testSuiteName;
|
||||
}
|
||||
|
||||
public checkTestCodeOutput(fileName: string) {
|
||||
|
@ -384,7 +386,7 @@ class CompilerBaselineRunner extends RunnerBase {
|
|||
}
|
||||
|
||||
public initializeTests() {
|
||||
describe('Compiler tests', () => {
|
||||
describe(this.testSuiteName + ' tests', () => {
|
||||
describe("Setup compiler for compiler baselines", () => {
|
||||
var harnessCompiler = Harness.Compiler.getCompiler();
|
||||
this.parseOptions();
|
||||
|
|
|
@ -35,7 +35,7 @@ class FourSlashRunner extends RunnerBase {
|
|||
this.tests = this.enumerateFiles(this.basePath, /\.ts/i, { recursive: false });
|
||||
}
|
||||
|
||||
describe('Fourslash tests', () => {
|
||||
describe(this.testSuiteName + ' tests', () => {
|
||||
this.tests.forEach((fn: string) => {
|
||||
describe(fn, () => {
|
||||
fn = ts.normalizeSlashes(fn);
|
||||
|
|
Загрузка…
Ссылка в новой задаче