@@ -20,6 +20,8 @@ const cmdLineOptions = require("./scripts/build/options");
2020const copyright = "CopyrightNotice.txt" ;
2121const cleanTasks = [ ] ;
2222
23+ const testRunner = "./built/local/testRunner/_namespaces/Harness.js"
24+
2325const buildScripts = ( ) => buildProject ( "scripts" ) ;
2426task ( "scripts" , buildScripts ) ;
2527task ( "scripts" ) . description = "Builds files in the 'scripts' folder." ;
@@ -125,6 +127,9 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
125127const preBuild = cmdLineOptions . lkg ? lkgPreBuild : localPreBuild ;
126128
127129const buildServices = ( ( ) => {
130+ // TODO(jakebailey): fix this for modules
131+ return cb => { console . log ( "!!!TODO!!! buildServices" ) ; cb ( ) ; } ;
132+
128133 // build typescriptServices.out.js
129134 const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
130135
@@ -258,6 +263,9 @@ task("watch-min").flags = {
258263} ;
259264
260265const buildLssl = ( ( ) => {
266+ // TODO(jakebailey): fix this for modules
267+ return cb => { console . log ( "!!!TODO!!! buildLssl" ) ; cb ( ) ; } ;
268+
261269 // build tsserverlibrary.out.js
262270 const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
263271
@@ -451,8 +459,8 @@ preTest.displayName = "preTest";
451459
452460const postTest = ( done ) => cmdLineOptions . lint ? lint ( done ) : done ( ) ;
453461
454- const runTests = ( ) => runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
455- task ( "runtests" , series ( preBuild , preTest , runTests , postTest ) ) ;
462+ const runTests = ( ) => runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
463+ task ( "runtests" , series ( /* preBuild, preTest,*/ runTests /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
456464task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
457465task ( "runtests" ) . flags = {
458466 "-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -471,8 +479,8 @@ task("runtests").flags = {
471479 " --shardId" : "1-based ID of this shard (default: 1)" ,
472480} ;
473481
474- const runTestsParallel = ( ) => runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
475- task ( "runtests-parallel" , series ( preBuild , preTest , runTestsParallel , postTest ) ) ;
482+ const runTestsParallel = ( ) => runConsoleTests ( testRunner , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
483+ task ( "runtests-parallel" , series ( /* preBuild, preTest,*/ runTestsParallel /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
476484task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
477485task ( "runtests-parallel" ) . flags = {
478486 " --no-lint" : "disables lint." ,
@@ -621,10 +629,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
621629// write some kind of trigger file that indicates build completion that we could listen for instead.
622630const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
623631 if ( cmdLineOptions . tests || cmdLineOptions . failed ) {
624- await runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
632+ await runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
625633 }
626634 else {
627- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
635+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
628636 }
629637} ) ;
630638task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments