|
11 | 11 | "cwd": "${workspaceRoot}", |
12 | 12 | "valuesFormatting": "parseText" |
13 | 13 | }, |
| 14 | + { |
| 15 | + "type": "gdb", |
| 16 | + "request": "launch", |
| 17 | + "name": "Launch Program", |
| 18 | + "target": ".obj/server/ada_language_server", |
| 19 | + "cwd": "${workspaceRoot}", |
| 20 | + "valuesFormatting": "parseText" |
| 21 | + }, |
14 | 22 | { |
15 | 23 | "name": "Launch Extension", |
16 | 24 | "type": "extensionHost", |
|
47 | 55 | } |
48 | 56 | }, |
49 | 57 | { |
50 | | - "name": "Highlighting Tests (Update tests ref)", |
| 58 | + "name": "Launch Extension Testsuite", |
| 59 | + "type": "node", |
| 60 | + "request": "launch", |
| 61 | + "cwd": "${workspaceFolder}/integration/vscode/ada/", |
| 62 | + "runtimeExecutable": "npm", |
| 63 | + "runtimeArgs": ["run-script", "test"] |
| 64 | + }, |
| 65 | + { |
| 66 | + "name": "General Testsuite", |
51 | 67 | "type": "extensionHost", |
52 | 68 | "request": "launch", |
53 | 69 | "runtimeExecutable": "${execPath}", |
|
57 | 73 | ], |
58 | 74 | "args": [ |
59 | 75 | "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada", |
60 | | - "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/general/highlighting/index", |
61 | | - "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace" |
| 76 | + "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/general/index", |
| 77 | + "${workspaceFolder}/integration/vscode/ada/test/workspaces/general" |
62 | 78 | ], |
63 | 79 | // Below we make the executables of node modules visible to the tests. |
64 | 80 | // In particular, vscode-tmgrammar-snap is used for syntax highlighting |
65 | 81 | // tests. |
66 | 82 | "env": { |
| 83 | + "MOCHA_GREP": "${input:testPattern}", |
67 | 84 | // This is necessary to make the "child" vscode inherit the PATH |
68 | 85 | // variable set in the workspace settings. Without it in some setups |
69 | 86 | // (e.g. vscode remote) the child vscode does not get visibility |
|
74 | 91 | // integration/vscode/ada/test/suite/index.ts to prevent timeouts in |
75 | 92 | // tests when debugging |
76 | 93 | "MOCHA_TIMEOUT": "0", |
77 | | - // Setting this environment variable causes the tests to overwrite |
78 | | - // previous test references when they are stored in files. See |
79 | | - // assertEqualToFileContent in |
80 | | - // integration/vscode/ada/test/suite/highlighting.test.ts |
81 | | - "MOCHA_ALS_UPDATE": "1" |
82 | | - }, |
83 | | - "preLaunchTask": "npm: pretest", |
84 | | - // Switch to Debug Console to see test results |
85 | | - "internalConsoleOptions": "openOnSessionStart" |
86 | | - }, |
87 | | - { |
88 | | - "name": "Server Extensions Tests", |
89 | | - "type": "extensionHost", |
90 | | - "request": "launch", |
91 | | - "runtimeExecutable": "${execPath}", |
92 | | - "outFiles": [ |
93 | | - "${workspaceFolder}/integration/vscode/ada/out/**/*.js", |
94 | | - "!**/node_modules/**" |
95 | | - ], |
96 | | - "args": [ |
97 | | - "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada", |
98 | | - "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/general/serverExtensions/index", |
99 | | - "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace" |
100 | | - ], |
101 | | - "env": { |
102 | | - "PATH": "${env:PATH}", |
103 | | - "MOCHA_TIMEOUT": "0" |
| 94 | + "MOCHA_ALS_UPDATE": "${input:updateTestRefs}" |
104 | 95 | }, |
105 | 96 | "preLaunchTask": "npm: pretest", |
106 | 97 | "internalConsoleOptions": "openOnSessionStart" |
107 | 98 | }, |
108 | 99 | { |
109 | | - "name": "GNATtest Integration Tests", |
| 100 | + "name": "GNATtest Integration Testsuite", |
110 | 101 | "type": "extensionHost", |
111 | 102 | "request": "launch", |
112 | 103 | "runtimeExecutable": "${execPath}", |
|
117 | 108 | "args": [ |
118 | 109 | "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada", |
119 | 110 | "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/gnattest/index", |
120 | | - "${workspaceFolder}/integration/vscode/ada/test/GnattestWorkspace" |
121 | | - ], |
122 | | - "env": { |
123 | | - "PATH": "${env:PATH}", |
124 | | - "MOCHA_TIMEOUT": "0" |
125 | | - }, |
126 | | - "preLaunchTask": "npm: pretest", |
127 | | - "internalConsoleOptions": "openOnSessionStart" |
128 | | - }, |
129 | | - { |
130 | | - "type": "gdb", |
131 | | - "request": "launch", |
132 | | - "name": "Launch Program", |
133 | | - "target": ".obj/server/ada_language_server", |
134 | | - "cwd": "${workspaceRoot}", |
135 | | - "valuesFormatting": "parseText" |
136 | | - }, |
137 | | - { |
138 | | - "name": "Extension Tests (Test Name Regexp)", |
139 | | - "type": "extensionHost", |
140 | | - "request": "launch", |
141 | | - "runtimeExecutable": "${execPath}", |
142 | | - "outFiles": [ |
143 | | - "${workspaceFolder}/integration/vscode/ada/out/**/*.js", |
144 | | - "!**/node_modules/**" |
145 | | - ], |
146 | | - "args": [ |
147 | | - "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada", |
148 | | - "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/index", |
149 | | - "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace" |
| 111 | + "${workspaceFolder}/integration/vscode/ada/test/workspaces/gnattest" |
150 | 112 | ], |
151 | 113 | // Below we make the executables of node modules visible to the tests. |
152 | 114 | // In particular, vscode-tmgrammar-snap is used for syntax highlighting |
|
173 | 135 | "inputs": [ |
174 | 136 | { |
175 | 137 | "id": "testPattern", |
176 | | - "description": "A regexp of tests to run", |
| 138 | + "description": "A regexp of tests to run. Keep empty for not filtering any", |
177 | 139 | "type": "promptString" |
178 | 140 | }, |
179 | 141 | { |
180 | 142 | "id": "updateTestRefs", |
181 | 143 | "description": "Update test references? Keep empty for no update", |
182 | | - "type": "promptString", |
183 | | - "default": "" |
| 144 | + "type": "promptString" |
184 | 145 | }, |
185 | 146 | { |
186 | 147 | "id": "pid", |
|
0 commit comments