@@ -19,6 +19,8 @@ const cmdLineOptions = require("./scripts/build/options");
1919const copyright = "CopyrightNotice.txt" ;
2020const cleanTasks = [ ] ;
2121
22+ const testRunner = "./built/local/testRunner/_namespaces/Harness.js" ;
23+
2224const buildScripts = ( ) => buildProject ( "scripts" ) ;
2325task ( "scripts" , buildScripts ) ;
2426task ( "scripts" ) . description = "Builds files in the 'scripts' folder." ;
@@ -119,6 +121,12 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
119121const preBuild = cmdLineOptions . lkg ? lkgPreBuild : localPreBuild ;
120122
121123const buildServices = ( ( ) => {
124+ // TODO(jakebailey): fix this for modules
125+ return cb => {
126+ console . log ( "!!!TODO!!! buildServices" ) ;
127+ cb ( ) ;
128+ } ;
129+
122130 // build typescriptServices.out.js
123131 const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
124132
@@ -252,6 +260,12 @@ task("watch-min").flags = {
252260} ;
253261
254262const buildLssl = ( ( ) => {
263+ // TODO(jakebailey): fix this for modules
264+ return cb => {
265+ console . log ( "!!!TODO!!! buildLssl" ) ;
266+ cb ( ) ;
267+ } ;
268+
255269 // build tsserverlibrary.out.js
256270 const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
257271
@@ -424,8 +438,8 @@ task("watch-local").flags = {
424438const preTest = parallel ( buildTsc , buildTests , buildServices , buildLssl ) ;
425439preTest . displayName = "preTest" ;
426440
427- const runTests = ( ) => runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
428- task ( "runtests" , series ( preBuild , preTest , runTests ) ) ;
441+ const runTests = ( ) => runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
442+ task ( "runtests" , series ( /* preBuild, preTest,*/ runTests ) ) ; // TODO(jakebailey): fix this for modules
429443task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
430444task ( "runtests" ) . flags = {
431445 "-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -443,8 +457,8 @@ task("runtests").flags = {
443457 " --shardId" : "1-based ID of this shard (default: 1)" ,
444458} ;
445459
446- const runTestsParallel = ( ) => runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
447- task ( "runtests-parallel" , series ( preBuild , preTest , runTestsParallel ) ) ;
460+ const runTestsParallel = ( ) => runConsoleTests ( testRunner , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
461+ task ( "runtests-parallel" , series ( /* preBuild, preTest,*/ runTestsParallel ) ) ; // TODO(jakebailey): fix this for modules
448462task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
449463task ( "runtests-parallel" ) . flags = {
450464 " --light" : "Run tests in light mode (fewer verifications, but tests run faster)." ,
@@ -592,10 +606,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
592606// write some kind of trigger file that indicates build completion that we could listen for instead.
593607const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
594608 if ( cmdLineOptions . tests || cmdLineOptions . failed ) {
595- await runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
609+ await runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
596610 }
597611 else {
598- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
612+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
599613 }
600614} ) ;
601615task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments