From d7f93707183b4600b570abe697261e0f40d083e3 Mon Sep 17 00:00:00 2001 From: iirina Date: Thu, 16 May 2019 17:45:55 +0200 Subject: [PATCH] Test java coverage with java_tools released and built at head. --- src/test/shell/bazel/BUILD | 58 ++++++ .../shell/bazel/bazel_coverage_java_test.sh | 170 ++++++++++++++++++ 2 files changed, 228 insertions(+) diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index b9dc26009f064f..3da7a2a47ade19 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -369,14 +369,72 @@ sh_test( name = "bazel_coverage_java_test", srcs = ["bazel_coverage_java_test.sh"], data = [":test-deps"], + args = [ + "@bazel_tools//tools/jdk:toolchain", + "released", + ], tags = [ "no_windows", ], ) +# Test java coverage with the java_toolchain in the released java_tools versions. +[ + sh_test( + name = "bazel_coverage_java_jdk" + java_version + "toolchain_released_test", + srcs = ["bazel_coverage_java_test.sh"], + data = [":test-deps"], + args = select({ + "//src/conditions:darwin": ["@remote_java_tools_javac" + java_version + "_test_darwin//:toolchain"], + "//src/conditions:darwin_x86_64": ["@remote_java_tools_javac" + java_version + "_test_darwin//:toolchain"], + "//src/conditions:windows": ["@remote_java_tools_javac" + java_version + "_test_windows//:toolchain"], + "//src/conditions:linux_x86_64": ["@remote_java_tools_javac" + java_version + "_test_linux//:toolchain"], + }) + [ + # java_tools zip to test + "released", + # --javabase value + ] + select({ + "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"], + "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"], + "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"], + "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"], + }), + tags = [ + "no_windows", + ], + ) + for java_version in JAVA_VERSIONS +] + +# Test java coverage with the java_toolchain in the java_tools zip built at head. +[ + sh_test( + name = "bazel_coverage_java_jdk" + java_version + "_toolchain_head_test", + srcs = ["bazel_coverage_java_test.sh"], + args = [ + # --java_toolchain + "@local_java_tools//:toolchain", + # java_tools zip to test + "src/java_tools_java" + java_version + ".zip", + # --javabase value + ] + select({ + "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"], + "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"], + "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"], + "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"], + }), + data = [ + ":test-deps", + "//src:java_tools_java" + java_version + "_zip", + ], + ) + for java_version in JAVA_VERSIONS +] + sh_test( name = "bazel_coverage_sh_test", srcs = ["bazel_coverage_sh_test.sh"], + data = [":test-deps"], tags = [ "no_windows", diff --git a/src/test/shell/bazel/bazel_coverage_java_test.sh b/src/test/shell/bazel/bazel_coverage_java_test.sh index e2ccd8b6b200f8..d5cc4ac984754b 100755 --- a/src/test/shell/bazel/bazel_coverage_java_test.sh +++ b/src/test/shell/bazel/bazel_coverage_java_test.sh @@ -21,6 +21,176 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${CURRENT_DIR}/../integration_test_setup.sh" \ || { echo "integration_test_setup.sh not found!" >&2; exit 1; } +JAVA_TOOLCHAIN="$1"; shift +add_to_bazelrc "build --java_toolchain=${JAVA_TOOLCHAIN}" + +JAVA_TOOLS_ZIP="$1"; shift +if [[ "${JAVA_TOOLS_ZIP}" != "released" ]]; then + if [[ "${JAVA_TOOLS_ZIP}" == file* ]]; then + JAVA_TOOLS_ZIP_FILE_URL="${JAVA_TOOLS_ZIP}" + elif "$is_windows"; then + JAVA_TOOLS_ZIP_FILE_URL="file:///$(rlocation io_bazel/$JAVA_TOOLS_ZIP)" + else + JAVA_TOOLS_ZIP_FILE_URL="file://$(rlocation io_bazel/$JAVA_TOOLS_ZIP)" + fi +fi +JAVA_TOOLS_ZIP_FILE_URL=${JAVA_TOOLS_ZIP_FILE_URL:-} + +if [[ $# -gt 0 ]]; then + JAVABASE_VALUE="$1"; shift + add_to_bazelrc "build --javabase=${JAVABASE_VALUE}" +fi + +function set_up() { + cat >>WORKSPACE <>WORKSPACE <>WORKSPACE <