hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 16:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Java: Make integration test more robust wrt recent Java versions.

Browse Source 
I've been investigating moving the Java integration tests to a
GH-hosted macos runner, instead of a self-hosted one.
This test is not compatible with a GH-hosted runners Java setup.
It is also not compatible to being exposed to JAVA_21_HOME_X64 variable yet.

This PR fixes both issues.
This commit is contained in:
Cornelius Riemenschneider
2023-11-06 23:22:05 +01:00
parent 3465c34cb6
commit ae21bbf0b2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py
View File

@@ -3,14 +3,16 @@ from create_database_utils import *
from diagnostics_test_utils import *
# Ensure we're using an old Java version that won't work with Gradle
if "JAVA_HOME_8_X64" in os.environ:
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_8_X64"]
sep = ";" if platform.system() == "Windows" else ":"
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
for java_home in ["JAVA_HOME_8_X64", "JAVA_HOME_8_arm64", "JAVA_HOME_8_ARM64"]:
if java_home in os.environ:
os.environ["JAVA_HOME"] = os.environ[java_home]
sep = ";" if platform.system() == "Windows" else ":"
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
break
# Ensure the autobuilder *doesn't* see Java 11 or 17, which it could switch to in order to build the project:
for k in ["JAVA_HOME_11_X64", "JAVA_HOME_17_X64"]:
if k in os.environ:
# Ensure the autobuilder *doesn't* see newer Java versions, which it could switch to in order to build the project:
for k in os.environ:
if re.match(r"^JAVA_HOME_\d\d_", k):
del os.environ[k]
# Use a custom, empty toolchains.xml file so the autobuilder doesn't see any Java versions that may be