From 9ecd488ea572432895bd49e2d4d71bcaa0be722b Mon Sep 17 00:00:00 2001 From: iirina Date: Thu, 6 Jun 2019 07:34:44 -0700 Subject: [PATCH] Default java toolchain target The previous javac version used by the default_java_toolchain in Bazel had a non-standard modification to default to the Java 8 language level, which wasn't carried forward to 11. Adding default values for {source,target}_version in the default_java_toolchain to keep Bazel backwards compatibility. Fixes #8539. Closes #8569. PiperOrigin-RevId: 251848351 --- .bazelci/postsubmit.yml | 495 +++++++++-------- .bazelci/presubmit.yml | 511 +++++++++--------- src/test/shell/bazel/BUILD | 9 + .../shell/bazel/bazel_java_test_defaults.sh | 92 ++++ tools/jdk/default_java_toolchain.bzl | 2 + 5 files changed, 599 insertions(+), 510 deletions(-) create mode 100755 src/test/shell/bazel/bazel_java_test_defaults.sh diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index 79537076e25f41..b4c8fa7bcd4904 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -1,303 +1,298 @@ --- platforms: - ubuntu1404: + ubuntu1604: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/buildjar/..." - - "-//src/java_tools/import_deps_checker/..." + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/singlejar/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/buildjar/..." + - "-//src/java_tools/import_deps_checker/..." include_json_profile: - - build - - test - ubuntu1604: + - build + - test + ubuntu1804: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/buildjar/..." - - "-//src/java_tools/import_deps_checker/..." + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/singlejar/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # Some prebuilt jars don't run with Java 11 + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:maven_test" + # Re-enable once bootstrap works with Java 11 + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." include_json_profile: - - build - - test - ubuntu1804: + - build + - test + ubuntu1804_clang: + platform: ubuntu1804 + environment: + CC: clang + CC_CONFIGURE_DEBUG: 1 + name: "Clang" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Some prebuilt jars don't run with Java 11 - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:maven_test" - # Re-enable once bootstrap works with Java 11 - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." + - "--" + - "//src/test/shell/bazel:cc_integration_test" include_json_profile: - - build - - test + - build + - test ubuntu1804_javabase9: platform: ubuntu1804_nojava name: ":java: OpenJDK 9 Javabase" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--javabase=@openjdk9_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk9_linux_archive//:runtime" - - "--test_timeout=1200" + - "--javabase=@openjdk9_linux_archive//:runtime" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/aquery_differ/..." - - "//tools/android/..." - - "//tools/python/..." - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." - # Currently broken tests on this platform. - # These tests do not work without an installed system JDK: - # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) - # TODO(philwo): Use tags instead of an explicit blacklist. - - "-//src/test/java/com/google/devtools/build/android/..." - - "-//src/test/py/bazel:launcher_test" - - "-//src/test/py/bazel:runfiles_test" - - "-//src/test/shell/bazel/android/..." - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" - - "-//src/test/shell/bazel:bazel_coverage_java_test" - - "-//src/test/shell/bazel:bazel_coverage_sh_test" - - "-//src/test/shell/bazel:bazel_determinism_test" - - "-//src/test/shell/bazel:bazel_example_test" - - "-//src/test/shell/bazel:bazel_java_test" - - "-//src/test/shell/bazel:bazel_random_characters_test" - - "-//src/test/shell/bazel:bazel_repository_cache_test" - - "-//src/test/shell/bazel:bazel_rules_test" - - "-//src/test/shell/bazel:bazel_sandboxing_test" - - "-//src/test/shell/bazel:bazel_test_test" - - "-//src/test/shell/bazel:empty_package_test" - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:java_launcher_test" - - "-//src/test/shell/bazel:local_repository_test" - - "-//src/test/shell/bazel:maven_test" - - "-//src/test/shell/bazel:runfiles_test" - - "-//src/test/shell/integration:bazel_java_test" - - "-//src/test/shell/integration:bazel_sandboxed_worker_test" - - "-//src/test/shell/integration:bazel_worker_test" - - "-//src/test/shell/integration:discard_analysis_cache_test" - - "-//src/test/shell/integration:java_integration_test" - - "-//src/test/shell/integration:jvm_flags_escaping_test" - - "-//src/test/shell/integration:minimal_jdk_test" - - "-//src/test/shell/integration:output_filter_test" - - "-//src/test/shell/integration:stub_finds_runfiles_test" - - "-//src/test/shell/integration:test_test" - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/singlejar/..." + - "//third_party/ijar/..." + - "//tools/aquery_differ/..." + - "//tools/android/..." + - "//tools/python/..." + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." + # Currently broken tests on this platform. + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + # TODO(philwo): Use tags instead of an explicit blacklist. + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_java_test_defaults" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" + - "-//src/test/shell/bazel:maven_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" include_json_profile: - - build - - test + - build + - test ubuntu1804_javabase10: platform: ubuntu1804_nojava name: ":java: OpenJDK 10 Javabase" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--javabase=@openjdk10_linux_archive//:runtime" + - "--javabase=@openjdk10_linux_archive//:runtime" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk10_linux_archive//:runtime" - - "--test_timeout=1200" + - "--javabase=@openjdk10_linux_archive//:runtime" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/aquery_differ/..." - - "//tools/android/..." - - "//tools/python/..." - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." - # Currently broken tests on this platform. - # These tests do not work without an installed system JDK: - # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) - # TODO(philwo): Use tags instead of an explicit blacklist. - - "-//src/test/java/com/google/devtools/build/android/..." - - "-//src/test/py/bazel:launcher_test" - - "-//src/test/py/bazel:runfiles_test" - - "-//src/test/shell/bazel/android/..." - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" - - "-//src/test/shell/bazel:bazel_coverage_java_test" - - "-//src/test/shell/bazel:bazel_coverage_sh_test" - - "-//src/test/shell/bazel:bazel_determinism_test" - - "-//src/test/shell/bazel:bazel_example_test" - - "-//src/test/shell/bazel:bazel_java_test" - - "-//src/test/shell/bazel:bazel_random_characters_test" - - "-//src/test/shell/bazel:bazel_repository_cache_test" - - "-//src/test/shell/bazel:bazel_rules_test" - - "-//src/test/shell/bazel:bazel_sandboxing_test" - - "-//src/test/shell/bazel:bazel_test_test" - - "-//src/test/shell/bazel:empty_package_test" - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:java_launcher_test" - - "-//src/test/shell/bazel:local_repository_test" - - "-//src/test/shell/bazel:maven_test" - - "-//src/test/shell/bazel:runfiles_test" - - "-//src/test/shell/integration:bazel_java_test" - - "-//src/test/shell/integration:bazel_sandboxed_worker_test" - - "-//src/test/shell/integration:bazel_worker_test" - - "-//src/test/shell/integration:discard_analysis_cache_test" - - "-//src/test/shell/integration:java_integration_test" - - "-//src/test/shell/integration:jvm_flags_escaping_test" - - "-//src/test/shell/integration:minimal_jdk_test" - - "-//src/test/shell/integration:output_filter_test" - - "-//src/test/shell/integration:stub_finds_runfiles_test" - - "-//src/test/shell/integration:test_test" - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/singlejar/..." + - "//third_party/ijar/..." + - "//tools/aquery_differ/..." + - "//tools/android/..." + - "//tools/python/..." + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." + # Currently broken tests on this platform. + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + # TODO(philwo): Use tags instead of an explicit blacklist. + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_java_test_defaults" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" + - "-//src/test/shell/bazel:maven_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" include_json_profile: - - build - - test + - build + - test macos: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--apple_platform_type=macos" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--apple_platform_type=macos" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--test_timeout=1200" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" test_targets: - - "--" - - "//scripts/..." - - "//src/test/..." - - "//src/tools/singlejar/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/osx/crosstool/..." - - "//tools/python/..." - - "-//src/test/shell/integration:minimal_jdk_test" - # C++ coverage is not supported on macOS yet. - - "-//src/test/shell/bazel:bazel_cc_code_coverage_test" - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" - - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_released" - - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_head" - - "-//src/test/shell/bazel:bazel_java_test_jdk10_toolchain_head" + - "--" + - "//scripts/..." + - "//src/test/..." + - "//src/tools/singlejar/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/osx/crosstool/..." + - "//tools/python/..." + - "-//src/test/shell/integration:minimal_jdk_test" + # C++ coverage is not supported on macOS yet. + - "-//src/test/shell/bazel:bazel_cc_code_coverage_test" + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" + - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_released" + - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_head" + - "-//src/test/shell/bazel:bazel_java_test_jdk10_toolchain_head" include_json_profile: - - build - - test + - build + - test windows: batch_commands: - - powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE" + - powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE" build_flags: - - "--copt=-w" - - "--host_copt=-w" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--copt=-w" + - "--host_copt=-w" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--copt=-w" - - "--host_copt=-w" - - "--test_env=JAVA_HOME" - - "--test_timeout=1200" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--copt=-w" + - "--host_copt=-w" + - "--test_env=JAVA_HOME" + - "--test_timeout=1200" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" test_targets: - - "--" - - "//src:all_windows_tests" - # TODO(iirina): Re-enable after #7952 was released. - - "-//src/test/shell/bazel:embedded_tools_deps_test" + - "--" + - "//src:all_windows_tests" + # TODO(iirina): Re-enable after #7952 was released. + - "-//src/test/shell/bazel:embedded_tools_deps_test" include_json_profile: - - build - - test + - build + - test rbe_ubuntu1604: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' - -e 's/^# android_ndk_repository/android_ndk_repository/' - -e 's/^# rbe_autoconfig/rbe_autoconfig/' - -e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' + -e 's/^# android_ndk_repository/android_ndk_repository/' + -e 's/^# rbe_autoconfig/rbe_autoconfig/' + -e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" include_json_profile: - - build + - build diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 87c974ecb25c4f..8d9309bc09587a 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -1,305 +1,296 @@ --- platforms: - ubuntu1404: + ubuntu1604: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Disable Slow Tests - - "-//src/test/shell/bazel:bazel_determinism_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 - - "-//src/test/shell/bazel/android:android_ndk_integration_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/buildjar/..." - - "-//src/java_tools/import_deps_checker/..." - ubuntu1604: + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/execlog/..." + - "//src/tools/singlejar/..." + - "//src/tools/workspacelog/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # Disable Slow Tests + - "-//src/test/shell/bazel:bazel_determinism_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 + - "-//src/test/shell/bazel/android:android_ndk_integration_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/buildjar/..." + - "-//src/java_tools/import_deps_checker/..." + ubuntu1804: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Disable Slow Tests - - "-//src/test/shell/bazel:bazel_determinism_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 - - "-//src/test/shell/bazel/android:android_ndk_integration_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/buildjar/..." - - "-//src/java_tools/import_deps_checker/..." - ubuntu1804: + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/execlog/..." + - "//src/tools/singlejar/..." + - "//src/tools/workspacelog/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # Disable Slow Tests + - "-//src/test/shell/bazel:bazel_determinism_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 + - "-//src/test/shell/bazel/android:android_ndk_integration_test" + # Some prebuilt jars don't run with Java 11 + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:maven_test" + # Re-enable once bootstrap works with Java 11 + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." + ubuntu1804_clang: + platform: ubuntu1804 + environment: + CC: clang + CC_CONFIGURE_DEBUG: 1 + name: "Clang" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Disable Slow Tests - - "-//src/test/shell/bazel:bazel_determinism_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 - - "-//src/test/shell/bazel/android:android_ndk_integration_test" - # Some prebuilt jars don't run with Java 11 - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:maven_test" - # Re-enable once bootstrap works with Java 11 - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." + - "--" + - "//src/test/shell/bazel:cc_integration_test" ubuntu1804_javabase9: platform: ubuntu1804_nojava name: ":java: OpenJDK 9 Javabase" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--javabase=@openjdk9_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk9_linux_archive//:runtime" - - "--test_timeout=1200" + - "--javabase=@openjdk9_linux_archive//:runtime" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Disable Slow Tests - - "-//src/test/shell/bazel:bazel_determinism_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." - # These tests do not work without an installed system JDK: - # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) - - "-//src/test/java/com/google/devtools/build/android/..." - - "-//src/test/py/bazel:launcher_test" - - "-//src/test/py/bazel:runfiles_test" - - "-//src/test/shell/bazel/android/..." - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" - - "-//src/test/shell/bazel:bazel_coverage_java_test" - - "-//src/test/shell/bazel:bazel_coverage_sh_test" - - "-//src/test/shell/bazel:bazel_determinism_test" - - "-//src/test/shell/bazel:bazel_example_test" - - "-//src/test/shell/bazel:bazel_java_test" - - "-//src/test/shell/bazel:bazel_random_characters_test" - - "-//src/test/shell/bazel:bazel_repository_cache_test" - - "-//src/test/shell/bazel:bazel_rules_test" - - "-//src/test/shell/bazel:bazel_sandboxing_test" - - "-//src/test/shell/bazel:bazel_test_test" - - "-//src/test/shell/bazel:empty_package_test" - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:java_launcher_test" - - "-//src/test/shell/bazel:local_repository_test" - - "-//src/test/shell/bazel:maven_test" - - "-//src/test/shell/bazel:runfiles_test" - - "-//src/test/shell/integration:bazel_java_test" - - "-//src/test/shell/integration:bazel_sandboxed_worker_test" - - "-//src/test/shell/integration:bazel_worker_test" - - "-//src/test/shell/integration:discard_analysis_cache_test" - - "-//src/test/shell/integration:java_integration_test" - - "-//src/test/shell/integration:jvm_flags_escaping_test" - - "-//src/test/shell/integration:minimal_jdk_test" - - "-//src/test/shell/integration:output_filter_test" - - "-//src/test/shell/integration:stub_finds_runfiles_test" - - "-//src/test/shell/integration:test_test" + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/execlog/..." + - "//src/tools/singlejar/..." + - "//src/tools/workspacelog/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # Disable Slow Tests + - "-//src/test/shell/bazel:bazel_determinism_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_java_test_defaults" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" + - "-//src/test/shell/bazel:maven_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" ubuntu1804_javabase10: platform: ubuntu1804_nojava name: ":java: OpenJDK 10 Javabase" shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--javabase=@openjdk10_linux_archive//:runtime" + - "--javabase=@openjdk10_linux_archive//:runtime" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk10_linux_archive//:runtime" - - "--test_timeout=1200" + - "--javabase=@openjdk10_linux_archive//:runtime" + - "--test_timeout=1200" test_targets: - - "--" - - "//scripts/..." - - "//src/java_tools/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/python/..." - # Disable Slow Tests - - "-//src/test/shell/bazel:bazel_determinism_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - - "-//src/java_tools/import_deps_checker/..." - # These tests do not work without an installed system JDK: - # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) - - "-//src/test/java/com/google/devtools/build/android/..." - - "-//src/test/py/bazel:launcher_test" - - "-//src/test/py/bazel:runfiles_test" - - "-//src/test/shell/bazel/android/..." - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" - - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" - - "-//src/test/shell/bazel:bazel_coverage_java_test" - - "-//src/test/shell/bazel:bazel_coverage_sh_test" - - "-//src/test/shell/bazel:bazel_determinism_test" - - "-//src/test/shell/bazel:bazel_example_test" - - "-//src/test/shell/bazel:bazel_java_test" - - "-//src/test/shell/bazel:bazel_random_characters_test" - - "-//src/test/shell/bazel:bazel_repository_cache_test" - - "-//src/test/shell/bazel:bazel_rules_test" - - "-//src/test/shell/bazel:bazel_sandboxing_test" - - "-//src/test/shell/bazel:bazel_test_test" - - "-//src/test/shell/bazel:empty_package_test" - - "-//src/test/shell/bazel:external_integration_test" - - "-//src/test/shell/bazel:java_launcher_test" - - "-//src/test/shell/bazel:local_repository_test" - - "-//src/test/shell/bazel:maven_test" - - "-//src/test/shell/bazel:runfiles_test" - - "-//src/test/shell/integration:bazel_java_test" - - "-//src/test/shell/integration:bazel_sandboxed_worker_test" - - "-//src/test/shell/integration:bazel_worker_test" - - "-//src/test/shell/integration:discard_analysis_cache_test" - - "-//src/test/shell/integration:java_integration_test" - - "-//src/test/shell/integration:jvm_flags_escaping_test" - - "-//src/test/shell/integration:minimal_jdk_test" - - "-//src/test/shell/integration:output_filter_test" - - "-//src/test/shell/integration:stub_finds_runfiles_test" - - "-//src/test/shell/integration:test_test" + - "--" + - "//scripts/..." + - "//src/java_tools/..." + - "//src/test/..." + - "//src/tools/execlog/..." + - "//src/tools/singlejar/..." + - "//src/tools/workspacelog/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/python/..." + # Disable Slow Tests + - "-//src/test/shell/bazel:bazel_determinism_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 + - "-//src/java_tools/import_deps_checker/..." + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_java_test_defaults" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" + - "-//src/test/shell/bazel:maven_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" macos: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# - android_ndk_repository/android_ndk_repository/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# + android_ndk_repository/android_ndk_repository/' WORKSPACE + - rm -f WORKSPACE.bak build_flags: - - "--apple_platform_type=macos" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--apple_platform_type=macos" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--test_timeout=1200" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--test_timeout=1200" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" test_targets: - - "--" - - "//scripts/..." - - "//src/test/..." - - "//src/tools/execlog/..." - - "//src/tools/singlejar/..." - - "//src/tools/workspacelog/..." - - "//third_party/ijar/..." - - "//tools/android/..." - - "//tools/aquery_differ/..." - - "//tools/osx/crosstool/..." - - "//tools/python/..." - # C++ coverage is not supported on macOS yet. - - "-//src/test/shell/bazel:bazel_cc_code_coverage_test" - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 - - "-//src/test/shell/bazel/android:android_ndk_integration_test" - # The below tests have been disabled because they are too slow on macOS. - # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4684 - - "-//src/test/shell/bazel:bazel_determinism_test" - - "-//src/test/shell/bazel:bazel_java_test" - - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_released" - - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_head" - - "-//src/test/shell/bazel:bazel_java_test_jdk10_toolchain_head" - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" - - "-//src/test/shell/bazel/remote:remote_execution_test" - - "-//src/test/shell/bazel/remote:remote_execution_http_test" - - "-//src/test/shell/bazel:skylark_git_repository_test" - - "-//src/test/shell/bazel:external_path_test" - - "-//src/test/py/bazel:runfiles_test" - - "-//src/test/shell/bazel:git_repository_test" - - "-//src/test/shell/bazel/android:aar_integration_test" - - "-//src/test/shell/bazel/android:android_integration_test" - - "-//src/test/shell/integration:minimal_jdk_test" + - "--" + - "//scripts/..." + - "//src/test/..." + - "//src/tools/execlog/..." + - "//src/tools/singlejar/..." + - "//src/tools/workspacelog/..." + - "//third_party/ijar/..." + - "//tools/android/..." + - "//tools/aquery_differ/..." + - "//tools/osx/crosstool/..." + - "//tools/python/..." + # C++ coverage is not supported on macOS yet. + - "-//src/test/shell/bazel:bazel_cc_code_coverage_test" + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663 + - "-//src/test/shell/bazel/android:android_ndk_integration_test" + # The below tests have been disabled because they are too slow on macOS. + # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4684 + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_released" + - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_head" + - "-//src/test/shell/bazel:bazel_java_test_jdk10_toolchain_head" + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel/remote:remote_execution_test" + - "-//src/test/shell/bazel/remote:remote_execution_http_test" + - "-//src/test/shell/bazel:skylark_git_repository_test" + - "-//src/test/shell/bazel:external_path_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel:git_repository_test" + - "-//src/test/shell/bazel/android:aar_integration_test" + - "-//src/test/shell/bazel/android:android_integration_test" + - "-//src/test/shell/integration:minimal_jdk_test" windows: batch_commands: - - powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE" + - powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE" build_flags: - - "--copt=-w" - - "--host_copt=-w" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--copt=-w" + - "--host_copt=-w" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" test_flags: - - "--copt=-w" - - "--host_copt=-w" - - "--test_env=JAVA_HOME" - - "--test_timeout=1200" - # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. - - "--noincompatible_strict_action_env" + - "--copt=-w" + - "--host_copt=-w" + - "--test_env=JAVA_HOME" + - "--test_timeout=1200" + # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed. + - "--noincompatible_strict_action_env" test_targets: - - "--" - - "//src:all_windows_tests" + - "--" + - "//src:all_windows_tests" rbe_ubuntu1604: shell_commands: - - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' - -e 's/^# android_ndk_repository/android_ndk_repository/' - -e 's/^# rbe_autoconfig/rbe_autoconfig/' - -e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE - - rm -f WORKSPACE.bak + - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' + -e 's/^# android_ndk_repository/android_ndk_repository/' + -e 's/^# rbe_autoconfig/rbe_autoconfig/' + -e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE + - rm -f WORKSPACE.bak build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" + - "//src:bazel" + - "//src:bazel_jdk_minimal" diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 93dc52df63d2a2..86868870eb1b78 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -146,6 +146,15 @@ sh_test( ], ) +sh_test( + name = "bazel_java_test_defaults", + srcs = ["bazel_java_test_defaults.sh"], + data = [ + ":test-deps", + "@bazel_tools//tools/bash/runfiles", + ], +) + sh_test( name = "bazel_java_test", # TODO(iirina): Investigate if the 'large' and 'eternal' values still apply. diff --git a/src/test/shell/bazel/bazel_java_test_defaults.sh b/src/test/shell/bazel/bazel_java_test_defaults.sh new file mode 100755 index 00000000000000..e68d12ff25a1ac --- /dev/null +++ b/src/test/shell/bazel/bazel_java_test_defaults.sh @@ -0,0 +1,92 @@ +#!/bin/bash +# +# Copyright 2016 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Tests the java rules with the default values provided by Bazel. +# + +add_to_bazelrc "build --javabase=@bazel_tools//tools/jdk:remote_jdk11" + +# --- begin runfiles.bash initialization --- +if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + if [[ -f "$0.runfiles_manifest" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest" + elif [[ -f "$0.runfiles/MANIFEST" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST" + elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + export RUNFILES_DIR="$0.runfiles" + fi +fi +if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash" +elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ + "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" +else + echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash" + exit 1 +fi +# --- end runfiles.bash initialization --- + +source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \ + || { echo "integration_test_setup.sh not found!" >&2; exit 1; } + +case "$(uname -s | tr [:upper:] [:lower:])" in +msys*|mingw*|cygwin*) + declare -r is_windows=true + ;; +*) + declare -r is_windows=false + ;; +esac + +if "$is_windows"; then + export MSYS_NO_PATHCONV=1 + export MSYS2_ARG_CONV_EXCL="*" +fi + + +function test_default_java_toolchain_target_version() { + mkdir -p java/main + cat >java/main/BUILD <java/main/JavaBinary.java <"${TEST_log}" + expect_log "Successfully executed JavaBinary!" + javap -verbose -cp bazel-bin/java/main/JavaBinary.jar JavaBinary | grep major &>"${TEST_log}" + expect_log "major version: 52" +} + +run_suite "Java integration tests with default Bazel values" \ No newline at end of file diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index 3fdcfc1c7b540c..da8f1182644038 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -79,6 +79,8 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "compatible_javacopts": COMPATIBLE_JAVACOPTS, "singlejar": ["@bazel_tools//tools/jdk:singlejar"], "bootclasspath": ["@bazel_tools//tools/jdk:platformclasspath"], + "source_version": "8", + "target_version": "8", } def default_java_toolchain(name, **kwargs):