Skip to content

Commit b3e1867

Browse files
committed
Merge branch 'mr/thevenoux-langkit-query-language#568' into 'master'
Make tests target independent Closes #434 See merge request eng/libadalang/langkit-query-language!562
2 parents 2f25d4f + c5469b9 commit b3e1867

File tree

12 files changed

+15
-43
lines changed

12 files changed

+15
-43
lines changed

testsuite/drivers/base_driver.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ def output_refiners(self) -> list[OutputRefiner]:
417417
result.append(Substitute(self.working_dir(), "<working-dir>"))
418418
if self.test_env.get("canonicalize_backslashes", True):
419419
result.append(Substitute("\\", "/"))
420+
if self.test_env.get("canonicalize_target", False):
421+
result.append(Substitute("x86_64-linux", "<target>"))
422+
result.append(Substitute("x86_64-windows", "<target>"))
420423
return result
421424

422425
def parse_flagged_lines(self, output: str) -> dict[str, TaggedLines]:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<gnatcheck_worker_exe> -P<working-dir>/p.gpr --target=x86_64-linux -d --log-file=<working-dir>/gnatcheck-log1.TMP --files-from=<working-dir>/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck-rules0.TMP
1+
<gnatcheck_worker_exe> -P<working-dir>/p.gpr --target=<target> -d --log-file=<working-dir>/gnatcheck-log1.TMP --files-from=<working-dir>/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck-rules0.TMP

testsuite/tests/gnatcheck/implicit_project_spawn/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ rules:
55
- +Rsame_instantiations
66
extra_args:
77
- -d
8+
canonicalize_target: true

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

Lines changed: 0 additions & 14 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
testsuite_driver: No output file generated by gnatcheck
2-
kb: info: can't find a toolchain for the following configuration: language 'Ada', target 'x86_64-linux', runtime 'unknown'
2+
kb: info: can't find a toolchain for the following configuration: language 'Ada', target '<target>', runtime 'unknown'
33
prj.gpr:1:1: error: cannot load the Ada runtime, processing failed
44
try "gnatcheck --help" for more information.
55
>>>program returned status code 2
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Expected behavior here is that libgpr warns when a runtime doesn't exist
2+
3+
driver: gnatcheck
4+
project: prj.gpr
5+
rules:
6+
- +Rrecursive_subprograms
7+
extra_args:
8+
- --RTS=unknown
9+
canonicalize_target: true

testsuite/tests/gnatcheck_errors/wrong_runtime/windows/main.adb

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)