Skip to content

Commit 5bd3f97

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into builderApi
2 parents 5bc78af + 76d9524 commit 5bd3f97

508 files changed

Lines changed: 13429 additions & 4895 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ internal/
5858
!tests/baselines/reference/project/nodeModules*/**/*
5959
.idea
6060
yarn.lock
61+
yarn-error.log
6162
.parallelperf.*
6263
tests/cases/user/*/package-lock.json
6364
tests/cases/user/*/node_modules/

‎Gulpfile.ts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
151151

152152
const esnextLibrarySource = [
153153
"esnext.asynciterable.d.ts",
154+
"esnext.array.d.ts",
154155
"esnext.promise.d.ts"
155156
];
156157

@@ -680,14 +681,14 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
680681
workerCount = cmdLineOptions.workers;
681682
}
682683

683-
if (tests || runners || light || taskConfigsFolder) {
684-
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit);
685-
}
686-
687684
if (tests && tests.toLocaleLowerCase() === "rwc") {
688685
testTimeout = 400000;
689686
}
690687

688+
if (tests || runners || light || testTimeout || taskConfigsFolder) {
689+
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout);
690+
}
691+
691692
const colors = cmdLineOptions.colors;
692693
const reporter = cmdLineOptions.reporter || defaultReporter;
693694

@@ -872,8 +873,17 @@ function cleanTestDirs(done: (e?: any) => void) {
872873
}
873874

874875
// used to pass data from jake command line directly to run.js
875-
function writeTestConfigFile(tests: string, runners: string, light: boolean, taskConfigsFolder?: string, workerCount?: number, stackTraceLimit?: string) {
876-
const testConfigContents = JSON.stringify({ test: tests ? [tests] : undefined, runner: runners ? runners.split(",") : undefined, light, workerCount, stackTraceLimit, taskConfigsFolder, noColor: !cmdLineOptions.colors });
876+
function writeTestConfigFile(tests: string, runners: string, light: boolean, taskConfigsFolder?: string, workerCount?: number, stackTraceLimit?: string, timeout?: number) {
877+
const testConfigContents = JSON.stringify({
878+
test: tests ? [tests] : undefined,
879+
runner: runners ? runners.split(",") : undefined,
880+
light,
881+
workerCount,
882+
stackTraceLimit,
883+
taskConfigsFolder,
884+
noColor: !cmdLineOptions.colors,
885+
timeout,
886+
});
877887
console.log("Running tests with config: " + testConfigContents);
878888
fs.writeFileSync("test.config", testConfigContents);
879889
}

‎Jakefile.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {
214214

215215
var esnextLibrarySource = [
216216
"esnext.asynciterable.d.ts",
217+
"esnext.array.d.ts",
217218
"esnext.promise.d.ts"
218219
];
219220

@@ -858,15 +859,16 @@ function cleanTestDirs() {
858859
}
859860

860861
// used to pass data from jake command line directly to run.js
861-
function writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, colors) {
862+
function writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, colors, testTimeout) {
862863
var testConfigContents = JSON.stringify({
863864
runners: runners ? runners.split(",") : undefined,
864865
test: tests ? [tests] : undefined,
865866
light: light,
866867
workerCount: workerCount,
867868
taskConfigsFolder: taskConfigsFolder,
868869
stackTraceLimit: stackTraceLimit,
869-
noColor: !colors
870+
noColor: !colors,
871+
timeout: testTimeout
870872
});
871873
fs.writeFileSync('test.config', testConfigContents);
872874
}
@@ -908,14 +910,14 @@ function runConsoleTests(defaultReporter, runInParallel) {
908910
workerCount = process.env.workerCount || process.env.p || os.cpus().length;
909911
}
910912

911-
if (tests || runners || light || taskConfigsFolder) {
912-
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, colors);
913-
}
914-
915913
if (tests && tests.toLocaleLowerCase() === "rwc") {
916914
testTimeout = 800000;
917915
}
918916

917+
if (tests || runners || light || testTimeout || taskConfigsFolder) {
918+
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, colors, testTimeout);
919+
}
920+
919921
var colorsFlag = process.env.color || process.env.colors;
920922
var colors = colorsFlag !== "false" && colorsFlag !== "0";
921923
var reporter = process.env.reporter || process.env.r || defaultReporter;

‎issue_template.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@
1515
**Expected behavior:**
1616

1717
**Actual behavior:**
18+
19+
**Related:**

0 commit comments

Comments
 (0)