Skip to content

Commit 287fb80

Browse files
committed
Make all toolchains available to test
1 parent 16d30d7 commit 287fb80

File tree

1 file changed

+31
-1
lines changed
  • java/ql/integration-tests/all-platforms/java/buildless-sibling-projects

1 file changed

+31
-1
lines changed

java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/test.py

+31-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,40 @@
22
from diagnostics_test_utils import *
33
from buildless_test_utils import *
44

5+
import tempfile
6+
import os.path
7+
import sys
8+
59
#The version of gradle used doesn't work on java 17
610
try_use_java11()
711

8-
run_codeql_database_create([], lang="java", extra_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true", "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"})
12+
# On actions, expose all usable toolchains so that we can test version-selection logic.
13+
14+
toolchains_dir = tempfile.mkdtemp(prefix="integration-tests-toolchains-")
15+
toolchains_file = os.path.join(toolchains_dir, "toolchains.xml")
16+
17+
with open(toolchains_file, "w") as f:
18+
f.write('<?xml version="1.0" encoding="UTF-8"?>\n<toolchains>\n')
19+
20+
for v in [8, 11, 17, 21]:
21+
homedir = os.getenv("JAVA_HOME_%d_X64" % v)
22+
if homedir is not None and homedir != "":
23+
f.write("""
24+
<toolchain>
25+
<type>jdk</type>
26+
<provides>
27+
<version>%d</version>
28+
<vendor>oracle</vendor>
29+
</provides>
30+
<configuration>
31+
<jdkHome>%s</jdkHome>
32+
</configuration>
33+
</toolchain>
34+
""" % (v, homedir))
35+
36+
f.write("</toolchains>")
37+
38+
run_codeql_database_create([], lang="java", extra_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true", "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true", "LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": toolchains_file})
939

1040
check_diagnostics()
1141
check_buildless_fetches()

0 commit comments

Comments
 (0)