@@ -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
@@ -249,6 +254,9 @@ task("watch-min").flags = {
249
254
} ;
250
255
251
256
const buildLssl = ( ( ) => {
257
+ // TODO(jakebailey): fix this for modules
258
+ return cb => { console . log ( "!!!TODO!!! buildLssl" ) ; cb ( ) ; } ;
259
+
252
260
// build tsserverlibrary.out.js
253
261
const buildServerLibraryOut = ( ) => buildProject ( "src/tsserverlibrary/tsconfig.json" , cmdLineOptions ) ;
254
262
@@ -442,8 +450,8 @@ preTest.displayName = "preTest";
442
450
443
451
const postTest = ( done ) => cmdLineOptions . lint ? lint ( done ) : done ( ) ;
444
452
445
- const runTests = ( ) => runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
446
- task ( "runtests" , series ( preBuild , preTest , runTests , postTest ) ) ;
453
+ const runTests = ( ) => runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ false ) ;
454
+ task ( "runtests" , series ( /* preBuild, preTest,*/ runTests /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
447
455
task ( "runtests" ) . description = "Runs the tests using the built run.js file." ;
448
456
task ( "runtests" ) . flags = {
449
457
"-t --tests=<regex>" : "Pattern for tests to run." ,
@@ -462,8 +470,8 @@ task("runtests").flags = {
462
470
" --shardId" : "1-based ID of this shard (default: 1)" ,
463
471
} ;
464
472
465
- const runTestsParallel = ( ) => runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
466
- task ( "runtests-parallel" , series ( preBuild , preTest , runTestsParallel , postTest ) ) ;
473
+ const runTestsParallel = ( ) => runConsoleTests ( testRunner , "min" , /*runInParallel*/ cmdLineOptions . workers > 1 , /*watchMode*/ false ) ;
474
+ task ( "runtests-parallel" , series ( /* preBuild, preTest,*/ runTestsParallel /* , postTest*/ ) ) ; // TODO(jakebailey): fix this for modules
467
475
task ( "runtests-parallel" ) . description = "Runs all the tests in parallel using the built run.js file." ;
468
476
task ( "runtests-parallel" ) . flags = {
469
477
" --no-lint" : "disables lint." ,
@@ -611,10 +619,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
611
619
// write some kind of trigger file that indicates build completion that we could listen for instead.
612
620
const watchRuntests = ( ) => watch ( [ "built/local/*.js" , "tests/cases/**/*.ts" , "tests/cases/**/tsconfig.json" ] , { delay : 5000 } , async ( ) => {
613
621
if ( cmdLineOptions . tests || cmdLineOptions . failed ) {
614
- await runConsoleTests ( "built/local/run.js" , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
622
+ await runConsoleTests ( testRunner , "mocha-fivemat-progress-reporter" , /*runInParallel*/ false , /*watchMode*/ true ) ;
615
623
}
616
624
else {
617
- await runConsoleTests ( "built/local/run.js" , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
625
+ await runConsoleTests ( testRunner , "min" , /*runInParallel*/ true , /*watchMode*/ true ) ;
618
626
}
619
627
} ) ;
620
628
task ( "watch" , series ( preBuild , preTest , parallel ( watchLib , watchDiagnostics , watchServices , watchLssl , watchTests , watchRuntests ) ) ) ;
0 commit comments