Skip to content

Commit b95260b

Browse files
committed
Merge branch 'topic/gnatcov-fix-import' into 'master'
Fix exclusion pattern for gnatcov instrumented sources Closes #1670 See merge request eng/ide/ada_language_server!2023
2 parents 5b366b6 + d23a622 commit b95260b

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

integration/vscode/ada/src/gnatcov.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,20 +390,21 @@ export async function addCoverageData(run: vscode.TestRun, covDir: string) {
390390
* avoid associating coverage data with the
391391
* instrumented sources, so we exclude any paths
392392
* containing the special directory
393-
* `gnatcov-instr`. Ideally it would have been nice
394-
* to exclude precisely `<obj-dir>/gnatcov-instr`
395-
* but that would need to be repeated for each obj
396-
* dir of each project in the closure. As we don't
397-
* have access to that information, we ignore all
398-
* paths containing a `gnatcov-instr` component.
393+
* `*gnatcov-instr`. Ideally it would have been
394+
* nice to exclude precisely
395+
* `<obj-dir>/<prj-name>-gnatcov-instr` but that
396+
* would need to be computed for each project in
397+
* the closure. As we don't have access to that
398+
* information, we ignore all paths containing a
399+
* `*gnatcov-instr` component.
399400
*
400401
* Note that a previous version excluded the entire
401402
* object dir which did not work well on projects
402403
* that use '.' as the object dir. In that case
403404
* excluding the object dir would exclude the
404405
* entire workspace and prevent finding any files.
405406
*/
406-
const exclude = `**/gnatcov-instr/**/*`;
407+
const exclude = `**/*gnatcov-instr/**/*`;
407408

408409
/**
409410
* If the prefixes haven't been found yet, or

0 commit comments

Comments
 (0)