Get rid of 'ada' mode in the testsuite

AdaCore · Oct 19, 2023 · bf6aace · bf6aace
1 parent 491da01
commit bf6aace
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/.gitlab-ci.plan b/.gitlab-ci.plan
@@ -4,11 +4,6 @@ def install():
     anod_install("libgpr2", qualifier="bare")
     anod_install("gprbuild")
 
-def lkql():
-    install()
-    anod_test("lkql")
-    anod_test("gnatcheck")
-
 def lkql_jit():
     install()
     anod_test("lkql", qualifier="implementation=jit")

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ test:
 
   parallel:
     matrix:
-      - LKQL_VARIANT: [lkql, lkql_jit, lkql_native_jit]
+      - LKQL_VARIANT: [lkql_jit, lkql_native_jit]
   artifacts:
     reports:
       junit: xunit-*.xml
diff --git a/testsuite/drivers/base_driver.py b/testsuite/drivers/base_driver.py
@@ -427,14 +427,8 @@ def add_missing_flags(self, missing_flags: Flags) -> None:
                         print(line, file=ada_file)
 
     def _define_lkql_executables(self) -> None:
-        # If the mode is Ada
-        if self.env.options.mode == "ada":
-            self.lkql_exe = ["lkql_ada"]
-            self.lkql_checker_exe = ["lkql_checker"]
-            self.gnatcheck_worker_exe = ["gnatcheck"]
-
         # If the mode is JIT
-        elif self.env.options.mode == "jit":
+        if self.env.options.mode == "jit":
             python_wrapper = P.join(self.env.support_dir, "lkql_jit.py")
             command_base = [sys.executable, python_wrapper]
             self.lkql_exe = [*command_base, "launcher"]

diff --git a/testsuite/tests/gnatcheck/lkql_rules_config/test.yaml b/testsuite/tests/gnatcheck/lkql_rules_config/test.yaml
@@ -3,5 +3,3 @@ project: prj.gpr
 lkql_rule_file: config.lkql
 format: brief
 show_rule: True
-control:
-  - [SKIP, "mode == 'ada'", "LKQL rule file feature unavailable on Ada implementation"]
diff --git a/testsuite/testsuite.py b/testsuite/testsuite.py
@@ -85,10 +85,9 @@ class LKQLTestsuite(Testsuite):
 
     def add_options(self, parser: ArgumentParser) -> None:
         parser.add_argument(
-            '--mode', default='ada',
-            choices=['ada', 'jit', 'native_jit'],
+            '--mode', default='jit', choices=['jit', 'native_jit'],
             help='The LKQL implementations to test.'
-                 ' Possible values are "ada", "jit" and "native_jit".'
+                 ' Possible values are "jit" and "native_jit".'
         )
         parser.add_argument(
             '--no-auto-path', action='store_true',