From 5c5768a7cb9a1752535fe78c36fcf0084ebf2a5a Mon Sep 17 00:00:00 2001 From: Hugo Guerrier Date: Fri, 20 Oct 2023 16:54:37 +0200 Subject: [PATCH] Remove usage of libadalang-internal-testsuite and use common-testsuite-sources --- .gitignore | 2 +- testsuite/tests/perf/gnatcoll/test.yaml | 2 +- testsuite/tests/perf/gnatcoverage/test.yaml | 2 +- testsuite/testsuite.py | 16 +++++++++------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 620cbf35d..7429aee40 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ testsuite/out/ lkql/build.sh testsuite/build testsuite/libadalang -testsuite/ada_projects/libadalang-internal-testsuite +testsuite/ada_projects/common-testsuite-sources testsuite/run_testsuite.sh callgrind* gnatcheck.out diff --git a/testsuite/tests/perf/gnatcoll/test.yaml b/testsuite/tests/perf/gnatcoll/test.yaml index aa7aa1e2a..342758105 100644 --- a/testsuite/tests/perf/gnatcoll/test.yaml +++ b/testsuite/tests/perf/gnatcoll/test.yaml @@ -1,5 +1,5 @@ driver: 'gnatcheck' -project: 'libadalang-internal-testsuite/sources/gnatcoll/gnatcoll.gpr' +project: 'common-testsuite-sources/gnatcoll/gnatcoll.gpr' rules: - +Rrecursive_subprograms - +Routside_references_from_subprograms diff --git a/testsuite/tests/perf/gnatcoverage/test.yaml b/testsuite/tests/perf/gnatcoverage/test.yaml index df9a7755d..84481e76f 100644 --- a/testsuite/tests/perf/gnatcoverage/test.yaml +++ b/testsuite/tests/perf/gnatcoverage/test.yaml @@ -1,5 +1,5 @@ driver: 'gnatcheck' -project: 'libadalang-internal-testsuite/sources/gnatcoverage/gnatcov.gpr' +project: 'common-testsuite-sources/gnatcoverage/gnatcov.gpr' rules: - +Rrecursive_subprograms - +Routside_references_from_subprograms diff --git a/testsuite/testsuite.py b/testsuite/testsuite.py index e5ca784f9..cc7fdb8c9 100755 --- a/testsuite/testsuite.py +++ b/testsuite/testsuite.py @@ -154,21 +154,23 @@ def set_up(self) -> None: ]) # If the performance mode is enabled, verify that the user has checked - # out the libadalang-internal-testsuite in the "ada_projects" directory. + # out the common-testsuite-sources in the "ada_projects" directory. # Additionally add the internal sources to the GPR project path. if self.env.options.perf_mode: - lalinttest_dir = P.join( + common_sources = P.join( self.root_dir, "ada_projects", - "libadalang-internal-testsuite" + "common-testsuite-sources" ) - if not P.isdir(lalinttest_dir): + if not P.isdir(common_sources): raise RuntimeError("You need to check out" - " 'libadalang-internal-testsuite' to enable" + " 'common-testsuite-sources' to enable" " performance testing") else: - lalinttest_sources = glob.glob(P.join(lalinttest_dir, "sources", "*")) - for source_dir in [s for s in lalinttest_sources if P.isdir(s)]: + lalinttest_sources = glob.glob(P.join(common_sources, "*")) + for source_dir in [ + s for s in lalinttest_sources if P.isdir(s) + ]: os.environ['GPR_PROJECT_PATH'] = P.pathsep.join([ source_dir, os.environ.get("GPR_PROJECT_PATH", ""),