Fix `@rules_java` CI with `Bazel@HEAD`. Broken by https://github.com/bazelbuild/bazel/commit/905d8e09e4b8dc7333ecd7f4621c7d98f55948a2 [^1] (ignore-relnotes) PiperOrigin-RevId: 908023960 Change-Id: I113d44af93935dbee4cc4d5c534799f034d4dfff
diff --git a/test/java/common/rules/common_launcher_java_library_tests.bzl b/test/java/common/rules/common_launcher_java_library_tests.bzl index f0a1958..fe17a7b 100644 --- a/test/java/common/rules/common_launcher_java_library_tests.bzl +++ b/test/java/common/rules/common_launcher_java_library_tests.bzl
@@ -605,34 +605,6 @@ "{package}/lib{name}.jar_manifest_proto", ]) -def _test_java_library_fix_deps_tool_written_to_params_file(name): - if not bazel_features.rules.analysis_tests_can_transition_on_experimental_incompatible_flags: - # Bazel 7 does not support transition on experimental_* flags. - # Exit early because this test case would be a loading phase error otherwise. - always_passes(name) - return - - util.helper_target( - java_library, - name = name + "/base", - srcs = ["Base.java"], - ) - - analysis_test( - name = name, - impl = _test_java_library_fix_deps_tool_written_to_params_file_impl, - config_settings = { - "//command_line_option:experimental_fix_deps_tool": "fixer", - }, - target = name + "/base", - ) - -def _test_java_library_fix_deps_tool_written_to_params_file_impl(env, target): - javac_action_subject.of(env, target, "{package}/lib{name}.jar").argv().contains_at_least([ - "--experimental_fix_deps_tool", - "fixer", - ]).in_order() - def _test_java_library_compilation_info_provider(name): util.helper_target( mock_java_toolchain, @@ -865,7 +837,6 @@ _test_java_library_files_to_compile, _test_java_library_runtime_deps_are_not_on_classpath, _test_java_library_runtime_deps_are_not_on_classpath_with_header_compilation, - _test_java_library_fix_deps_tool_written_to_params_file, _test_java_library_propagates_native_libraries, _test_java_library_gen_source_no_processor_names, _test_java_library_annotation_processing_using_javacopt,
diff --git a/test/java/common/rules/java_test_tests.bzl b/test/java/common/rules/java_test_tests.bzl index d4bd4b0..6c71d33 100644 --- a/test/java/common/rules/java_test_tests.bzl +++ b/test/java/common/rules/java_test_tests.bzl
@@ -67,32 +67,6 @@ matching.contains("deps not allowed without srcs"), ) -def _test_fix_deps_tool(name): - if not bazel_features.rules.analysis_tests_can_transition_on_experimental_incompatible_flags: - always_passes(name) - return - util.helper_target( - rule = java_test, - name = name + "/test", - srcs = [name + "/Test.java"], - ) - - analysis_test( - name = name, - target = name + "/test", - impl = _test_fix_deps_tool_impl, - config_settings = { - "//command_line_option:experimental_fix_deps_tool": "customfixer", - }, - ) - -def _test_fix_deps_tool_impl(env, target): - assert_compile_action = env.expect.that_target(target).action_named("Javac") - assert_compile_action.argv().contains_at_least([ - "--experimental_fix_deps_tool", - "customfixer", - ]).in_order() - def _test_java_test_propagates_direct_native_libraries(name): util.helper_target( cc_library, @@ -358,7 +332,6 @@ tests = [ _test_java_test_is_test_only, _test_deps_without_srcs_fails, - _test_fix_deps_tool, _test_java_test_propagates_direct_native_libraries, _test_coverage_uses_coverage_runner_for_main, _test_stamp_values,