From ff11ca9ee1e05d092d681d00e6cde6b0e0ae2502 Mon Sep 17 00:00:00 2001 From: Yui T Date: Fri, 30 Jan 2015 10:32:07 -0800 Subject: [PATCH 1/4] Update path to test262 and rwc tests files in the runners --- Jakefile | 14 +++++++++----- src/harness/harness.ts | 29 ++++++++++++++++++++--------- src/harness/rwcRunner.ts | 7 +++++-- src/harness/test262Runner.ts | 7 +++++-- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/Jakefile b/Jakefile index 15661debff62b..3a4f3af96773c 100644 --- a/Jakefile +++ b/Jakefile @@ -451,14 +451,16 @@ directory(builtLocalDirectory); var run = path.join(builtLocalDirectory, "run.js"); compileFile(run, harnessSources, [builtLocalDirectory, tscFile].concat(libraryTargets).concat(harnessSources), [], /*useBuiltCompiler:*/ true); +var internalTests = "internal/" + var localBaseline = "tests/baselines/local/"; var refBaseline = "tests/baselines/reference/"; -var localRwcBaseline = "tests/baselines/rwc/local/"; -var refRwcBaseline = "tests/baselines/rwc/reference/"; +var localRwcBaseline = internalTests + "baselines/rwc/local/"; +var refRwcBaseline = internalTests + "baselines/rwc/reference/"; -var localTest262Baseline = "tests/baselines/test262/local/"; -var refTest262Baseline = "tests/baselines/test262/reference/"; +var localTest262Baseline = internalTests + "baselines/test262/local/"; +var refTest262Baseline = internalTests + "baselines/test262/reference/"; desc("Builds the test infrastructure using the built compiler"); task("tests", ["local", run].concat(libraryTargets)); @@ -491,11 +493,13 @@ function cleanTestDirs() { jake.rmRf(localBaseline); } - // Clean the local Rwc baselines directory + // Clean the local Rwc baselines directory if (fs.existsSync(localRwcBaseline)) { jake.rmRf(localRwcBaseline); } + jake.mkdirP(localRwcBaseline); + jake.mkdirP(localTest262Baseline); jake.mkdirP(localBaseline); } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index df73e52a605a3..d6734ce28b248 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1557,21 +1557,32 @@ module Harness { export interface BaselineOptions { LineEndingSensitive?: boolean; Subfolder?: string; + Baselinefolder?: string; } - export function localPath(fileName: string, subfolder?: string) { - return baselinePath(fileName, 'local', subfolder); + export function localPath(fileName: string, baselinefolder?: string, subfolder?: string) { + if (baselinefolder === undefined) { + return baselinePath(fileName, 'local', 'tests/baselines', subfolder); + } + else { + return baselinePath(fileName, 'local', baselinefolder, subfolder); + } } - function referencePath(fileName: string, subfolder?: string) { - return baselinePath(fileName, 'reference', subfolder); + function referencePath(fileName: string, baselinefolder?: string, subfolder?: string) { + if (baselinefolder === undefined) { + return baselinePath(fileName, 'reference', 'tests/baselines', subfolder); + } + else { + return baselinePath(fileName, 'reference', baselinefolder, subfolder); + } } - function baselinePath(fileName: string, type: string, subfolder?: string) { + function baselinePath(fileName: string, type: string, baselinefolder: string, subfolder?: string) { if (subfolder !== undefined) { - return Harness.userSpecifiedroot + 'tests/baselines/' + subfolder + '/' + type + '/' + fileName; + return Harness.userSpecifiedroot + baselinefolder + '/' + subfolder + '/' + type + '/' + fileName; } else { - return Harness.userSpecifiedroot + 'tests/baselines/' + type + '/' + fileName; + return Harness.userSpecifiedroot + baselinefolder + '/' + type + '/' + fileName; } } @@ -1625,7 +1636,7 @@ module Harness { return; } - var refFilename = referencePath(relativeFilename, opts && opts.Subfolder); + var refFilename = referencePath(relativeFilename, opts && opts.Baselinefolder, opts && opts.Subfolder); if (actual === null) { actual = ''; @@ -1663,7 +1674,7 @@ module Harness { opts?: BaselineOptions): void { var actual = undefined; - var actualFilename = localPath(relativeFilename, opts && opts.Subfolder); + var actualFilename = localPath(relativeFilename, opts && opts.Baselinefolder, opts && opts.Subfolder); if (runImmediately) { actual = generateActual(actualFilename, generateContent); diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts index b506cdd66b656..17b524bf0cd49 100644 --- a/src/harness/rwcRunner.ts +++ b/src/harness/rwcRunner.ts @@ -26,7 +26,10 @@ module RWC { var otherFiles: { unitName: string; content: string; }[] = []; var compilerResult: Harness.Compiler.CompilerResult; var compilerOptions: ts.CompilerOptions; - var baselineOpts: Harness.Baseline.BaselineOptions = { Subfolder: 'rwc' }; + var baselineOpts: Harness.Baseline.BaselineOptions = { + Subfolder: 'rwc', + Baselinefolder: 'internal/baselines' + }; var baseName = /(.*)\/(.*).json/.exec(ts.normalizeSlashes(jsonPath))[2]; var currentDirectory: string; @@ -170,7 +173,7 @@ module RWC { } class RWCRunner extends RunnerBase { - private static sourcePath = "tests/cases/rwc/"; + private static sourcePath = "internal/cases/rwc/"; /** Setup the runner's tests so that they are ready to be executed by the harness * The first test should be a describe/it block that sets up the harness's compiler instance appropriately diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts index 24be77922f90e..0091da5e91182 100644 --- a/src/harness/test262Runner.ts +++ b/src/harness/test262Runner.ts @@ -3,7 +3,7 @@ /// class Test262BaselineRunner extends RunnerBase { - private static basePath = 'tests/cases/test262'; + private static basePath = 'internal/cases/test262'; private static helpersFilePath = 'tests/cases/test262-harness/helpers.d.ts'; private static helperFile = { unitName: Test262BaselineRunner.helpersFilePath, @@ -15,7 +15,10 @@ class Test262BaselineRunner extends RunnerBase { target: ts.ScriptTarget.Latest, module: ts.ModuleKind.CommonJS }; - private static baselineOptions: Harness.Baseline.BaselineOptions = { Subfolder: 'test262' }; + private static baselineOptions: Harness.Baseline.BaselineOptions = { + Subfolder: 'test262', + Baselinefolder: 'internal/baselines' + }; private static getTestFilePath(filename: string): string { return Test262BaselineRunner.basePath + "/" + filename; From e5be1c4a5dd8c56f4d770f1fef73088c42a75507 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 2 Feb 2015 12:52:26 -0800 Subject: [PATCH 2/4] Address pull request --- Jakefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jakefile b/Jakefile index 3a4f3af96773c..f663e162a16da 100644 --- a/Jakefile +++ b/Jakefile @@ -456,11 +456,11 @@ var internalTests = "internal/" var localBaseline = "tests/baselines/local/"; var refBaseline = "tests/baselines/reference/"; -var localRwcBaseline = internalTests + "baselines/rwc/local/"; -var refRwcBaseline = internalTests + "baselines/rwc/reference/"; +var localRwcBaseline = path.join(internalTests, "baselines/rwc/local"); +var refRwcBaseline = path.join(internalTests, "baselines/rwc/reference"); -var localTest262Baseline = internalTests + "baselines/test262/local/"; -var refTest262Baseline = internalTests + "baselines/test262/reference/"; +var localTest262Baseline = path.join(internalTests, "baselines/test262/local"); +var refTest262Baseline = path.join(internalTests, "baselines/test262/reference"); desc("Builds the test infrastructure using the built compiler"); task("tests", ["local", run].concat(libraryTargets)); @@ -511,8 +511,8 @@ function writeTestConfigFile(tests, testConfigFile) { } function deleteTemporaryProjectOutput() { - if (fs.existsSync(localBaseline + "projectOutput/")) { - jake.rmRf(localBaseline + "projectOutput/"); + if (fs.existsSync(path.join(localBaseline, "projectOutput/"))) { + jake.rmRf(path.join(localBaseline, "projectOutput/")); } } From c8ec14776264892cfa1510ef3a5fd5ed5558fb4c Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 3 Feb 2015 13:46:14 -0800 Subject: [PATCH 3/4] Address code review --- src/harness/harness.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 5bc8bc5fb13cc..525e7c413e248 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1569,29 +1569,29 @@ module Harness { Baselinefolder?: string; } - export function localPath(fileName: string, baselinefolder?: string, subfolder?: string) { - if (baselinefolder === undefined) { + export function localPath(fileName: string, baselineFolder?: string, subfolder?: string) { + if (baselineFolder === undefined) { return baselinePath(fileName, 'local', 'tests/baselines', subfolder); } else { - return baselinePath(fileName, 'local', baselinefolder, subfolder); + return baselinePath(fileName, 'local', baselineFolder, subfolder); } } - function referencePath(fileName: string, baselinefolder?: string, subfolder?: string) { - if (baselinefolder === undefined) { + function referencePath(fileName: string, baselineFolder?: string, subfolder?: string) { + if (baselineFolder === undefined) { return baselinePath(fileName, 'reference', 'tests/baselines', subfolder); } else { - return baselinePath(fileName, 'reference', baselinefolder, subfolder); + return baselinePath(fileName, 'reference', baselineFolder, subfolder); } } - function baselinePath(fileName: string, type: string, baselinefolder: string, subfolder?: string) { + function baselinePath(fileName: string, type: string, baselineFolder: string, subfolder?: string) { if (subfolder !== undefined) { - return Harness.userSpecifiedroot + baselinefolder + '/' + subfolder + '/' + type + '/' + fileName; + return Harness.userSpecifiedroot + baselineFolder + '/' + subfolder + '/' + type + '/' + fileName; } else { - return Harness.userSpecifiedroot + baselinefolder + '/' + type + '/' + fileName; + return Harness.userSpecifiedroot + baselineFolder + '/' + type + '/' + fileName; } } From 2e73d45bd49f066c46785cf69a632a5615d2daad Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 3 Feb 2015 15:16:29 -0800 Subject: [PATCH 4/4] Update API baselines --- tests/baselines/reference/APISample_compile.js | 2 ++ tests/baselines/reference/APISample_compile.types | 6 ++++++ tests/baselines/reference/APISample_linter.js | 2 ++ tests/baselines/reference/APISample_linter.types | 6 ++++++ tests/baselines/reference/APISample_transform.js | 2 ++ tests/baselines/reference/APISample_transform.types | 6 ++++++ tests/baselines/reference/APISample_watcher.js | 2 ++ tests/baselines/reference/APISample_watcher.types | 6 ++++++ 8 files changed, 32 insertions(+) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index f6a86d4c2455b..9f581cf34abb9 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -1186,6 +1186,7 @@ declare module "typescript" { target?: ScriptTarget; version?: boolean; watch?: boolean; + stripInternal?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -1216,6 +1217,7 @@ declare module "typescript" { description?: DiagnosticMessage; paramType?: DiagnosticMessage; error?: DiagnosticMessage; + experimental?: boolean; } const enum CharacterCodes { nullCharacter = 0, diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 4ef90c6d1146b..6a057658f5a33 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3818,6 +3818,9 @@ declare module "typescript" { watch?: boolean; >watch : boolean + stripInternal?: boolean; +>stripInternal : boolean + [option: string]: string | number | boolean; >option : string } @@ -3898,6 +3901,9 @@ declare module "typescript" { error?: DiagnosticMessage; >error : DiagnosticMessage >DiagnosticMessage : DiagnosticMessage + + experimental?: boolean; +>experimental : boolean } const enum CharacterCodes { >CharacterCodes : CharacterCodes diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index aef5c70349b7c..5fd4716b8e9b7 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -1215,6 +1215,7 @@ declare module "typescript" { target?: ScriptTarget; version?: boolean; watch?: boolean; + stripInternal?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -1245,6 +1246,7 @@ declare module "typescript" { description?: DiagnosticMessage; paramType?: DiagnosticMessage; error?: DiagnosticMessage; + experimental?: boolean; } const enum CharacterCodes { nullCharacter = 0, diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 957ccd3c01e8f..ffbe61d41a5da 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3948,6 +3948,9 @@ declare module "typescript" { watch?: boolean; >watch : boolean + stripInternal?: boolean; +>stripInternal : boolean + [option: string]: string | number | boolean; >option : string } @@ -4028,6 +4031,9 @@ declare module "typescript" { error?: DiagnosticMessage; >error : DiagnosticMessage >DiagnosticMessage : DiagnosticMessage + + experimental?: boolean; +>experimental : boolean } const enum CharacterCodes { >CharacterCodes : CharacterCodes diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 33cea1ea0af9a..6b5828ccb4ad5 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -1216,6 +1216,7 @@ declare module "typescript" { target?: ScriptTarget; version?: boolean; watch?: boolean; + stripInternal?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -1246,6 +1247,7 @@ declare module "typescript" { description?: DiagnosticMessage; paramType?: DiagnosticMessage; error?: DiagnosticMessage; + experimental?: boolean; } const enum CharacterCodes { nullCharacter = 0, diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index c091af5effb2d..293927b9ea9f6 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3896,6 +3896,9 @@ declare module "typescript" { watch?: boolean; >watch : boolean + stripInternal?: boolean; +>stripInternal : boolean + [option: string]: string | number | boolean; >option : string } @@ -3976,6 +3979,9 @@ declare module "typescript" { error?: DiagnosticMessage; >error : DiagnosticMessage >DiagnosticMessage : DiagnosticMessage + + experimental?: boolean; +>experimental : boolean } const enum CharacterCodes { >CharacterCodes : CharacterCodes diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 7c70ee1532ecc..c2cf2c8903366 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1253,6 +1253,7 @@ declare module "typescript" { target?: ScriptTarget; version?: boolean; watch?: boolean; + stripInternal?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -1283,6 +1284,7 @@ declare module "typescript" { description?: DiagnosticMessage; paramType?: DiagnosticMessage; error?: DiagnosticMessage; + experimental?: boolean; } const enum CharacterCodes { nullCharacter = 0, diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index c3d03259385db..d913559189835 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -4074,6 +4074,9 @@ declare module "typescript" { watch?: boolean; >watch : boolean + stripInternal?: boolean; +>stripInternal : boolean + [option: string]: string | number | boolean; >option : string } @@ -4154,6 +4157,9 @@ declare module "typescript" { error?: DiagnosticMessage; >error : DiagnosticMessage >DiagnosticMessage : DiagnosticMessage + + experimental?: boolean; +>experimental : boolean } const enum CharacterCodes { >CharacterCodes : CharacterCodes