@@ -19,6 +19,8 @@ const cmdLineOptions = require("./scripts/build/options");
19
19
const copyright = "CopyrightNotice.txt" ;
20
20
const cleanTasks = [ ] ;
21
21
22
+ const testRunner = "./built/local/testRunner/_namespaces/Harness.js" ;
23
+
22
24
const buildScripts = ( ) => buildProject ( "scripts" ) ;
23
25
task ( "scripts" , buildScripts ) ;
24
26
task ( "scripts" ) . description = "Builds files in the 'scripts' folder." ;
@@ -119,6 +121,12 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
119
121
const preBuild = cmdLineOptions . lkg ? lkgPreBuild : localPreBuild ;
120
122
121
123
const buildServices = ( ( ) => {
124
+ // TODO(jakebailey): fix this for modules
125
+ return cb => {
126
+ console . log ( "!!!TODO!!! buildServices" ) ;
127
+ cb ( ) ;
128
+ } ;
129
+
122
130
// build typescriptServices.out.js
123
131
const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
124
132
@@ -252,6 +260,12 @@ task("watch-min").flags = {
252
260
} ;
253
261
254
262
const buildLssl = ( ( ) => {
263
+ // TODO(jakebailey): fix this for modules
264
+ return cb => {
265
+ console . log ( "!!!TODO!!! buildLssl" ) ;
266
+ cb ( ) ;
267
+ } ;
268
+
255
269
// build tsserverlibrary.out.js
256
270
const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
257
271
@@ -424,8 +438,8 @@ task("watch-local").flags = {
424
438
const preTest = parallel ( buildTsc , buildTests , buildServices , buildLssl ) ;
425
439
preTest . displayName = "preTest" ;
426
440
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
429
443
task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
430
444
task ( "runtests" ) . flags = {
431
445
"-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -443,8 +457,8 @@ task("runtests").flags = {
443
457
" --shardId" : "1-based ID of this shard (default: 1)" ,
444
458
} ;
445
459
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
448
462
task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
449
463
task ( "runtests-parallel" ) . flags = {
450
464
" --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
592
606
// write some kind of trigger file that indicates build completion that we could listen for instead.
593
607
const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
594
608
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 ) ;
596
610
}
597
611
else {
598
- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
612
+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
599
613
}
600
614
} ) ;
601
615
task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments