Fix installation of dependent extensions

Dave Bartolomeo · Dave Bartolomeo · commit 02e5b4e8303d · 2022-07-29T12:03:43.000-04:00
diff --git a/extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts b/extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts
@@ -76,7 +76,6 @@ async function main() {
     const testDirsString = process.argv[2];
     const dirs = testDirsString.split(',').map(dir => dir.trim().toLocaleLowerCase());
     const extensionTestsEnv: Record<string, string> = {};
-    /*if (dirs.includes(TestDir.CliIntegration))*/ {
       console.log('Installing required extensions');
       const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);
       cp.spawnSync(
@@ -92,6 +91,7 @@ async function main() {
           stdio: 'inherit',
         }
       );
+    if (dirs.includes(TestDir.CliIntegration)) {
       extensionTestsEnv.INTEGRATION_TEST_MODE = 'true';
     }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ async function main() {`
`76`	`76`	`const testDirsString = process.argv[2];`
`77`	`77`	`const dirs = testDirsString.split(',').map(dir => dir.trim().toLocaleLowerCase());`
`78`	`78`	`const extensionTestsEnv: Record<string, string> = {};`
`79`		`- /if (dirs.includes(TestDir.CliIntegration))/ {`
`80`	`79`	`console.log('Installing required extensions');`
`81`	`80`	`const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);`
`82`	`81`	`cp.spawnSync(`
`@@ -92,6 +91,7 @@ async function main() {`
`92`	`91`	`stdio: 'inherit',`
`93`	`92`	`}`
`94`	`93`	`);`
	`94`	`+ if (dirs.includes(TestDir.CliIntegration)) {`
`95`	`95`	`extensionTestsEnv.INTEGRATION_TEST_MODE = 'true';`
`96`	`96`	`}`
`97`	`97`