From cff9bcfabce7cc2845fa12a2007e5f918d7fda7e Mon Sep 17 00:00:00 2001 From: Cornelius Riemenschneider Date: Mon, 6 Nov 2023 23:29:33 +0100 Subject: [PATCH] Revert "Revert "Java: Make integration test more robust wrt recent Java versions."" This reverts commit 4e70e674fdc5634852521533c604b8946b1d3692. --- .../diagnostics/java-version-too-old/test.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py b/java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py index 1cb00f89f55..e211786c43b 100644 --- a/java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py +++ b/java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py @@ -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