@@ -256,7 +256,7 @@ var harnessSources = harnessCoreSources.concat([
256256 "commandLineParsing.ts" ,
257257 "configurationExtension.ts" ,
258258 "convertCompilerOptionsFromJson.ts" ,
259- "convertTypingOptionsFromJson .ts" ,
259+ "convertTypeAcquisitionFromJson .ts" ,
260260 "tsserverProjectSystem.ts" ,
261261 "compileOnSave.ts" ,
262262 "typingsInstaller.ts" ,
@@ -593,7 +593,7 @@ task("generate-diagnostics", [diagnosticInfoMapTs]);
593593var configureNightlyJs = path . join ( scriptsDirectory , "configureNightly.js" ) ;
594594var configureNightlyTs = path . join ( scriptsDirectory , "configureNightly.ts" ) ;
595595var packageJson = "package.json" ;
596- var programTs = path . join ( compilerDirectory , "program .ts" ) ;
596+ var versionFile = path . join ( compilerDirectory , "core .ts" ) ;
597597
598598file ( configureNightlyTs ) ;
599599
@@ -609,7 +609,7 @@ task("setDebugMode", function () {
609609} ) ;
610610
611611task ( "configure-nightly" , [ configureNightlyJs ] , function ( ) {
612- var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + programTs ;
612+ var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + versionFile ;
613613 console . log ( cmd ) ;
614614 exec ( cmd ) ;
615615} , { async : true } ) ;
@@ -640,7 +640,7 @@ task("importDefinitelyTypedTests", [importDefinitelyTypedTestsJs], function () {
640640
641641// Local target to build the compiler and services
642642var tscFile = path . join ( builtLocalDirectory , compilerFilename ) ;
643- compileFile ( tscFile , compilerSources , [ builtLocalDirectory , copyright ] . concat ( compilerSources ) , [ copyright ] , /*useBuiltCompiler:*/ false ) ;
643+ compileFile ( tscFile , compilerSources , [ builtLocalDirectory , copyright ] . concat ( compilerSources ) , [ copyright ] , /*useBuiltCompiler:*/ false , { noMapRoot : true } ) ;
644644
645645var servicesFile = path . join ( builtLocalDirectory , "typescriptServices.js" ) ;
646646var servicesFileInBrowserTest = path . join ( builtLocalDirectory , "typescriptServicesInBrowserTest.js" ) ;
@@ -930,7 +930,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
930930 }
931931
932932 if ( tests && tests . toLocaleLowerCase ( ) === "rwc" ) {
933- testTimeout = 400000 ;
933+ testTimeout = 800000 ;
934934 }
935935
936936 colors = process . env . colors || process . env . color ;
@@ -1086,12 +1086,10 @@ task("tests-debug", ["setDebugMode", "tests"]);
10861086// Makes the test results the new baseline
10871087desc ( "Makes the most recent test results the new baseline, overwriting the old baseline" ) ;
10881088task ( "baseline-accept" , function ( ) {
1089- acceptBaseline ( "" ) ;
1089+ acceptBaseline ( localBaseline , refBaseline ) ;
10901090} ) ;
10911091
1092- function acceptBaseline ( containerFolder ) {
1093- var sourceFolder = path . join ( localBaseline , containerFolder ) ;
1094- var targetFolder = path . join ( refBaseline , containerFolder ) ;
1092+ function acceptBaseline ( sourceFolder , targetFolder ) {
10951093 console . log ( 'Accept baselines from ' + sourceFolder + ' to ' + targetFolder ) ;
10961094 var files = fs . readdirSync ( sourceFolder ) ;
10971095 var deleteEnding = '.delete' ;
@@ -1115,12 +1113,12 @@ function acceptBaseline(containerFolder) {
11151113
11161114desc ( "Makes the most recent rwc test results the new baseline, overwriting the old baseline" ) ;
11171115task ( "baseline-accept-rwc" , function ( ) {
1118- acceptBaseline ( "rwc" ) ;
1116+ acceptBaseline ( localRwcBaseline , refRwcBaseline ) ;
11191117} ) ;
11201118
11211119desc ( "Makes the most recent test262 test results the new baseline, overwriting the old baseline" ) ;
11221120task ( "baseline-accept-test262" , function ( ) {
1123- acceptBaseline ( "test262" ) ;
1121+ acceptBaseline ( localTest262Baseline , refTest262Baseline ) ;
11241122} ) ;
11251123
11261124
0 commit comments