File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ namespace Harness.Parallel.Host {
137
137
let closedWorkers = 0 ;
138
138
for ( let i = 0 ; i < workerCount ; i ++ ) {
139
139
// TODO: Just send the config over the IPC channel or in the command line arguments
140
- const config : TestConfig = { light : Harness . lightMode , listenForWork : true , runUnitTests : runners . length !== 1 } ;
140
+ const config : TestConfig = { light : Harness . lightMode , listenForWork : true , runUnitTests } ;
141
141
const configPath = ts . combinePaths ( taskConfigsFolder , `task-config${ i } .json` ) ;
142
142
Harness . IO . writeFile ( configPath , JSON . stringify ( config ) ) ;
143
143
const child = fork ( __filename , [ `--config="${ configPath } "` ] ) ;
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ let testConfigContent =
82
82
83
83
let taskConfigsFolder : string ;
84
84
let workerCount : number ;
85
- let runUnitTests = true ;
85
+ let runUnitTests : boolean | undefined ;
86
86
let noColors = false ;
87
87
88
88
interface TestConfig {
@@ -108,9 +108,7 @@ function handleTestConfig() {
108
108
if ( testConfig . light ) {
109
109
Harness . lightMode = true ;
110
110
}
111
- if ( testConfig . runUnitTests !== undefined ) {
112
- runUnitTests = testConfig . runUnitTests ;
113
- }
111
+ runUnitTests = testConfig . runUnitTests ;
114
112
if ( testConfig . workerCount ) {
115
113
workerCount = + testConfig . workerCount ;
116
114
}
@@ -199,6 +197,9 @@ function handleTestConfig() {
199
197
runners . push ( new FourSlashRunner ( FourSlashTestType . Server ) ) ;
200
198
// runners.push(new GeneratedFourslashRunner());
201
199
}
200
+ if ( runUnitTests === undefined ) {
201
+ runUnitTests = runners . length !== 1 ; // Don't run unit tests when running only one runner if unit tests were not explicitly asked for
202
+ }
202
203
}
203
204
204
205
function beginTests ( ) {
You can’t perform that action at this time.
0 commit comments