-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Expose toolchains to some Android tests, which would otherwise now tr…
…y to upgrade to JDK17
- Loading branch information
Showing
4 changed files
with
52 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import os.path | ||
import sys | ||
import tempfile | ||
|
||
def actions_expose_all_toolchains(): | ||
|
||
# On actions, expose all usable toolchains so that we can test version-selection logic. | ||
|
||
toolchains_dir = tempfile.mkdtemp(prefix="integration-tests-toolchains-") | ||
toolchains_file = os.path.join(toolchains_dir, "toolchains.xml") | ||
|
||
def none_or_blank(s): | ||
return s is None or s == "" | ||
|
||
with open(toolchains_file, "w") as f: | ||
f.write('<?xml version="1.0" encoding="UTF-8"?>\n<toolchains>\n') | ||
|
||
for v in [8, 11, 17, 21]: | ||
homedir = os.getenv("JAVA_HOME_%d_X64" % v) | ||
if none_or_blank(homedir): | ||
homedir = os.getenv("JAVA_HOME_%d_arm64" % v) | ||
if none_or_blank(homedir) and v == 8 and not none_or_blank(os.getenv("JAVA_HOME_11_arm64")): | ||
print("Mocking a toolchain entry using Java 11 install as a fake Java 8 entry, so this test behaves the same on x64 and arm64 runners", file = sys.stderr) | ||
homedir = os.getenv("JAVA_HOME_11_arm64") | ||
if homedir is not None and homedir != "": | ||
f.write(""" | ||
<toolchain> | ||
<type>jdk</type> | ||
<provides> | ||
<version>%d</version> | ||
<vendor>oracle</vendor> | ||
</provides> | ||
<configuration> | ||
<jdkHome>%s</jdkHome> | ||
</configuration> | ||
</toolchain> | ||
""" % (v, homedir)) | ||
|
||
f.write("</toolchains>") | ||
|
||
return toolchains_file | ||
|
6 changes: 4 additions & 2 deletions
6
...-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
import sys | ||
from create_database_utils import * | ||
from toolchains_test_utils import * | ||
|
||
try_use_java11() | ||
|
||
run_codeql_database_create([], lang="java") | ||
toolchains_file = actions_expose_all_toolchains() | ||
|
||
run_codeql_database_create([], lang="java", extra_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": toolchains_file}) |
7 changes: 4 additions & 3 deletions
7
java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
import sys | ||
|
||
from create_database_utils import * | ||
from toolchains_test_utils import * | ||
|
||
try_use_java11() | ||
|
||
run_codeql_database_create([], lang="java") | ||
toolchains_file = actions_expose_all_toolchains() | ||
|
||
run_codeql_database_create([], lang="java", extra_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": toolchains_file}) |
39 changes: 2 additions & 37 deletions
39
java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/test.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters