Skip to content

Commit 8e89625

Browse files
committed
Merge branch 'topic/testsuite/default_backslashes_canon' into 'master'
Defaultly canonicalize backslashes during output analysis in the testsuite Closes #483 See merge request eng/libadalang/langkit-query-language!443
2 parents 4f9d3fe + c6f46c6 commit 8e89625

File tree

12 files changed

+6
-29
lines changed

12 files changed

+6
-29
lines changed

testsuite/drivers/base_driver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ def run_in_tty(self, args: list[str], **kwargs) -> tuple[str, int]:
353353
def output_refiners(self) -> list[OutputRefiner]:
354354
result = super().output_refiners
355355
result.append(Substitute(self.working_dir(), "<working-dir>"))
356-
if self.test_env.get("canonicalize_backslashes", False):
356+
if self.test_env.get("canonicalize_backslashes", True):
357357
result.append(Substitute("\\", "/"))
358358
return result
359359

testsuite/tests/gnatcheck/lkql_rule_file_resolution/test.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ tests:
1111
project: prj/with_valid.gpr
1212
- label: With a project provided invalid rule file
1313
project: prj/with_invalid.gpr
14-
canonicalize_backslashes: True

testsuite/tests/gnatcheck_errors/already_existing_lkql_rule_file/test.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ rules:
55
extra_args:
66
- --emit-lkql-rule-file
77
post_python: "cat('rules.lkql', sort=False)"
8-
canonicalize_backslashes: True

testsuite/tests/gnatcheck_errors/generic_inst_walking/test.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ project: prj.gpr
33
extra_args: ['-l']
44
rules:
55
- +Rderiving_from_predefined_type
6-
canonicalize_backslashes: True

testsuite/tests/gnatcheck_errors/missing_source_dirs/linux/test.yaml

-9
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
driver: gnatcheck
2+
format: brief
3+
project: prj.gpr
4+
rules:
5+
- +RGOTO_Statements

testsuite/tests/gnatcheck_errors/missing_source_dirs/windows/prj.gpr

-3
This file was deleted.

testsuite/tests/gnatcheck_errors/missing_source_dirs/windows/test.out

-3
This file was deleted.

testsuite/tests/gnatcheck_errors/missing_source_dirs/windows/test.yaml

-9
This file was deleted.

testsuite/tests/interpreter_errors/ambiguous_import/test.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ driver: 'interpreter'
22
project: 'default_project/default.gpr'
33
lkql_path:
44
- others
5-
canonicalize_backslashes: True

0 commit comments

Comments
 (0)