Skip to content

Commit cdb5231

Browse files
committed
Merge branch 'topic/common_testsuite_sources' into 'master'
Remove usage of libadalang-internal-testsuite and use common-testsuite-sources See merge request eng/libadalang/langkit-query-language!126
2 parents ce8bd55 + 5c5768a commit cdb5231

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ testsuite/out/
1616
lkql/build.sh
1717
testsuite/build
1818
testsuite/libadalang
19-
testsuite/ada_projects/libadalang-internal-testsuite
19+
testsuite/ada_projects/common-testsuite-sources
2020
testsuite/run_testsuite.sh
2121
callgrind*
2222
gnatcheck.out

testsuite/tests/perf/gnatcoll/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
driver: 'gnatcheck'
2-
project: 'libadalang-internal-testsuite/sources/gnatcoll/gnatcoll.gpr'
2+
project: 'common-testsuite-sources/gnatcoll/gnatcoll.gpr'
33
rules:
44
- +Rrecursive_subprograms
55
- +Routside_references_from_subprograms

testsuite/tests/perf/gnatcoverage/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
driver: 'gnatcheck'
2-
project: 'libadalang-internal-testsuite/sources/gnatcoverage/gnatcov.gpr'
2+
project: 'common-testsuite-sources/gnatcoverage/gnatcov.gpr'
33
rules:
44
- +Rrecursive_subprograms
55
- +Routside_references_from_subprograms

testsuite/testsuite.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,23 @@ def set_up(self) -> None:
154154
])
155155

156156
# If the performance mode is enabled, verify that the user has checked
157-
# out the libadalang-internal-testsuite in the "ada_projects" directory.
157+
# out the common-testsuite-sources in the "ada_projects" directory.
158158
# Additionally add the internal sources to the GPR project path.
159159
if self.env.options.perf_mode:
160-
lalinttest_dir = P.join(
160+
common_sources = P.join(
161161
self.root_dir,
162162
"ada_projects",
163-
"libadalang-internal-testsuite"
163+
"common-testsuite-sources"
164164
)
165-
if not P.isdir(lalinttest_dir):
165+
if not P.isdir(common_sources):
166166
raise RuntimeError("You need to check out"
167-
" 'libadalang-internal-testsuite' to enable"
167+
" 'common-testsuite-sources' to enable"
168168
" performance testing")
169169
else:
170-
lalinttest_sources = glob.glob(P.join(lalinttest_dir, "sources", "*"))
171-
for source_dir in [s for s in lalinttest_sources if P.isdir(s)]:
170+
lalinttest_sources = glob.glob(P.join(common_sources, "*"))
171+
for source_dir in [
172+
s for s in lalinttest_sources if P.isdir(s)
173+
]:
172174
os.environ['GPR_PROJECT_PATH'] = P.pathsep.join([
173175
source_dir,
174176
os.environ.get("GPR_PROJECT_PATH", ""),

0 commit comments

Comments
 (0)