Skip to content

Commit 006c1ec

Browse files
committed
Merge branch 'topic/gnatcheck/codepeer_target' into 'master'
Various fixes about codepeer target fallback See merge request eng/libadalang/langkit-query-language!526
2 parents cc2dc41 + 698db44 commit 006c1ec

File tree

13 files changed

+3
-177
lines changed

13 files changed

+3
-177
lines changed

lkql_checker/src/gnatcheck-compiler.adb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,10 @@ package body Gnatcheck.Compiler is
110110
if GPRConfig_Exec = null then
111111
GPRConfig_Exec := Locate_Exec_On_Path ("codepeer-gprconfig");
112112

113-
-- If the result is still null, raise a fatal error. We cannot
114-
-- continue the analysis execution.
113+
-- If the result is still null, return the empty list, meaning
114+
-- that no target is available.
115115
if GPRConfig_Exec = null then
116-
Error ("cannot locate gprconfig executable");
117-
raise Fatal_Error;
116+
return Res;
118117
end if;
119118
end if;
120119
end if;

testsuite/tests/gnatcheck/target/codepeer/config.cgpr

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

testsuite/tests/gnatcheck/target/codepeer/main.adb

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

testsuite/tests/gnatcheck/target/codepeer/test.out

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

testsuite/tests/gnatcheck/target/codepeer/test.yaml

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

testsuite/tests/gnatcheck/target/codepeer/with_target.gpr

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

testsuite/tests/gnatcheck/target/codepeer/without_target.gpr

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

testsuite/tests/gnatcheck/target/linux/config.cgpr

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

testsuite/tests/gnatcheck/target/linux/main.adb

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

testsuite/tests/gnatcheck/target/linux/test.out

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

0 commit comments

Comments
 (0)