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

Java integration tests: More preparations to be executed on GH M1 machines
This commit is contained in:
Cornelius Riemenschneider
2023-11-13 11:16:51 +01:00
committed by GitHub
9 changed files with 11 additions and 33 deletions

View File

@@ -2,9 +2,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")

View File

@@ -2,9 +2,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")

View File

@@ -2,9 +2,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")

View File

@@ -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")

View File

@@ -2,9 +2,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")

View File

@@ -2,9 +2,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")

View File

@@ -2,9 +2,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")

View File

@@ -2,9 +2,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")

View File

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