Merge pull request #14719 from github/criemen/java-int-tests

Java integration tests: More preparations to be executed on GH M1 machines

Author: criemen

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py

@@ -1,10 +1,6 @@
 import sys
-
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/skip-on-platform-osx-arm

@@ -0,0 +1,3 @@
+2023-11-08:
+
+There is no Java 8 build available for OSX Arm, therefore this test fails.