@@ -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,9 @@ 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 => { console . log ( "!!!TODO!!! buildServices" ) ; cb ( ) ; } ;
126+
122127 // build typescriptServices.out.js
123128 const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
124129
@@ -252,6 +257,9 @@ task("watch-min").flags = {
252257} ;
253258
254259const buildLssl = ( ( ) => {
260+ // TODO(jakebailey): fix this for modules
261+ return cb => { console . log ( "!!!TODO!!! buildLssl" ) ; cb ( ) ; } ;
262+
255263 // build tsserverlibrary.out.js
256264 const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
257265
@@ -429,8 +437,8 @@ preTest.displayName = "preTest";
429437
430438const postTest = ( done ) => cmdLineOptions . lint ? lint ( ) : done ( ) ;
431439
432- const runTests = ( ) => runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
433- task ( "runtests" , series ( preBuild , preTest , runTests , postTest ) ) ;
440+ const runTests = ( ) => runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
441+ task ( "runtests" , series ( /* preBuild, preTest,*/ runTests /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
434442task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
435443task ( "runtests" ) . flags = {
436444 "-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -449,8 +457,8 @@ task("runtests").flags = {
449457 " --shardId" : "1-based ID of this shard (default: 1)" ,
450458} ;
451459
452- const runTestsParallel = ( ) => runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
453- task ( "runtests-parallel" , series ( preBuild , preTest , runTestsParallel , postTest ) ) ;
460+ const runTestsParallel = ( ) => runConsoleTests ( testRunner , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
461+ task ( "runtests-parallel" , series ( /* preBuild, preTest,*/ runTestsParallel /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
454462task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
455463task ( "runtests-parallel" ) . flags = {
456464 " --no-lint" : "disables lint." ,
@@ -599,10 +607,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
599607// write some kind of trigger file that indicates build completion that we could listen for instead.
600608const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
601609 if ( cmdLineOptions . tests || cmdLineOptions . failed ) {
602- await runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
610+ await runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
603611 }
604612 else {
605- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
613+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
606614 }
607615} ) ;
608616task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments