@@ -20,6 +20,8 @@ const cmdLineOptions = require("./scripts/build/options");
20
20
const copyright = "CopyrightNotice.txt" ;
21
21
const cleanTasks = [ ] ;
22
22
23
+ const testRunner = "./built/local/testRunner/_namespaces/Harness.js"
24
+
23
25
const buildScripts = ( ) => buildProject ( "scripts" ) ;
24
26
task ( "scripts" , buildScripts ) ;
25
27
task ( "scripts" ) . description = "Builds files in the 'scripts' folder." ;
@@ -125,6 +127,9 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
125
127
const preBuild = cmdLineOptions . lkg ? lkgPreBuild : localPreBuild ;
126
128
127
129
const buildServices = ( ( ) => {
130
+ // TODO(jakebailey): fix this for modules
131
+ return cb => { console . log ( "!!!TODO!!! buildServices" ) ; cb ( ) ; } ;
132
+
128
133
// build typescriptServices.out.js
129
134
const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
130
135
@@ -258,6 +263,9 @@ task("watch-min").flags = {
258
263
} ;
259
264
260
265
const buildLssl = ( ( ) => {
266
+ // TODO(jakebailey): fix this for modules
267
+ return cb => { console . log ( "!!!TODO!!! buildLssl" ) ; cb ( ) ; } ;
268
+
261
269
// build tsserverlibrary.out.js
262
270
const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
263
271
@@ -451,8 +459,8 @@ preTest.displayName = "preTest";
451
459
452
460
const postTest = ( done ) => cmdLineOptions . lint ? lint ( done ) : done ( ) ;
453
461
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
456
464
task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
457
465
task ( "runtests" ) . flags = {
458
466
"-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -471,8 +479,8 @@ task("runtests").flags = {
471
479
" --shardId" : "1-based ID of this shard (default: 1)" ,
472
480
} ;
473
481
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
476
484
task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
477
485
task ( "runtests-parallel" ) . flags = {
478
486
" --no-lint" : "disables lint." ,
@@ -621,10 +629,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
621
629
// write some kind of trigger file that indicates build completion that we could listen for instead.
622
630
const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
623
631
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 ) ;
625
633
}
626
634
else {
627
- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
635
+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
628
636
}
629
637
} ) ;
630
638
task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments