@@ -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,9 @@ 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 => { console . log ( "!!!TODO!!! buildServices" ) ; cb ( ) ; } ;
126
+
122
127
// build typescriptServices.out.js
123
128
const buildTypescriptServicesOut = ( ) => buildProject ( "src/typescriptServices/tsconfig.json" , cmdLineOptions ) ;
124
129
@@ -252,6 +257,9 @@ task("watch-min").flags = {
252
257
} ;
253
258
254
259
const buildLssl = ( ( ) => {
260
+ // TODO(jakebailey): fix this for modules
261
+ return cb => { console . log ( "!!!TODO!!! buildLssl" ) ; cb ( ) ; } ;
262
+
255
263
// build tsserverlibrary.out.js
256
264
const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
257
265
@@ -429,8 +437,8 @@ preTest.displayName = "preTest";
429
437
430
438
const postTest = ( done ) => cmdLineOptions . lint ? lint ( ) : done ( ) ;
431
439
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
434
442
task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
435
443
task ( "runtests" ) . flags = {
436
444
"-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -449,8 +457,8 @@ task("runtests").flags = {
449
457
" --shardId" : "1-based ID of this shard (default: 1)" ,
450
458
} ;
451
459
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
454
462
task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
455
463
task ( "runtests-parallel" ) . flags = {
456
464
" --no-lint" : "disables lint." ,
@@ -599,10 +607,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
599
607
// write some kind of trigger file that indicates build completion that we could listen for instead.
600
608
const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
601
609
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 ) ;
603
611
}
604
612
else {
605
- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
613
+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
606
614
}
607
615
} ) ;
608
616
task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments