Skip to content

Commit 8346eda

Browse files
authored
Integration tests: Accept github/codeql checkouts named ql (#1940)
Some checkouts of the github/codeql repo, such as the internal submodule, may be named `ql` rather than `codeql`. Allow this folder name when running tests.
1 parent 2a6d581 commit 8346eda

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • extensions/ql-vscode/test/vscode-tests/cli-integration

extensions/ql-vscode/test/vscode-tests/cli-integration/jest.setup.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ beforeAll(async () => {
6464
'No workspace folders found.\nYou will need a local copy of the codeql repo.\nMake sure you specify the path to it in launch.json.\nIt should be something along the lines of "${workspaceRoot}/../codeql" depending on where you have your local copy of the codeql repo.',
6565
);
6666
} else {
67-
const codeqlFolder = folders.find((folder) => folder.name === "codeql");
67+
const codeqlFolder = folders.find((folder) =>
68+
["codeql", "ql"].includes(folder.name),
69+
);
6870
if (!codeqlFolder) {
6971
throw new Error(
7072
'No workspace folders found.\nYou will need a local copy of the codeql repo.\nMake sure you specify the path to it in launch.json.\nIt should be something along the lines of "${workspaceRoot}/../codeql" depending on where you have your local copy of the codeql repo.\n\n\n',

0 commit comments

Comments
 (0)