Skip to content

Commit ad7f833

Browse files
hvadehrarules_java Copybara
authored andcommitted
Cleanup unused Bazel 6 test filtering
Follow up to b55339e [^1] PiperOrigin-RevId: 837439832 Change-Id: I8413040e00ce2b4338b2b0dd6802c8c990edb9e1
1 parent b5b4100 commit ad7f833

File tree

7 files changed

+0
-23
lines changed

7 files changed

+0
-23
lines changed

test/java/common/java_common_tests.bzl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ def _test_compile_exports_with_sources(name):
9191
name = name,
9292
impl = _test_compile_exports_with_sources_impl,
9393
target = target_name,
94-
# Bazel 6 JavaInfo doesn't expose compile_time_java_dependencies
95-
attr_values = {"tags": ["min_bazel_7"]},
9694
)
9795

9896
def _test_compile_exports_with_sources_impl(env, target):
@@ -138,7 +136,6 @@ def _test_compile_extend_compile_time_jdeps(name):
138136
name = name,
139137
impl = _test_compile_extend_compile_time_jdeps_impl,
140138
target = name + "/foo",
141-
attr_values = {"tags": ["min_bazel_7"]},
142139
)
143140

144141
def _test_compile_extend_compile_time_jdeps_impl(env, target):
@@ -181,7 +178,6 @@ def _test_compile_extend_compile_time_jdeps_rule_outputs(name):
181178
"bar": name + "/bar",
182179
"baz": name + "/baz",
183180
},
184-
attr_values = {"tags": ["min_bazel_7"]},
185181
)
186182

187183
def _test_compile_extend_compile_time_jdeps_rule_outputs_impl(env, targets):
@@ -234,7 +230,6 @@ def _test_compile_bootclasspath(name):
234230
name = name,
235231
impl = _test_compile_bootclasspath_impl,
236232
target = name + "/custom",
237-
attr_values = {"tags": ["min_bazel_7"]},
238233
)
239234

240235
def _test_compile_bootclasspath_impl(env, target):
@@ -269,7 +264,6 @@ def _test_compile_override_with_empty_bootclasspath(name):
269264
name = name,
270265
impl = _test_compile_override_with_empty_bootclasspath_impl,
271266
target = name + "/custom",
272-
attr_values = {"tags": ["min_bazel_7"]},
273267
)
274268

275269
def _test_compile_override_with_empty_bootclasspath_impl(env, target):

test/java/common/java_info_tests.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,6 @@ def _output_source_jars_returns_depset_test(name):
12551255
name = name,
12561256
impl = _output_source_jars_returns_depset_test_impl,
12571257
target = target_name,
1258-
attr_values = {"tags": ["min_bazel_7"]}, # changed in Bazel 7
12591258
)
12601259

12611260
def _output_source_jars_returns_depset_test_impl(env, target):

test/java/common/java_plugin_info_tests.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ def _test_without_processor_class(name):
124124
name = name,
125125
impl = _test_without_processor_class_impl,
126126
target = target_name,
127-
attr_values = {"tags": ["min_bazel_7"]},
128127
)
129128

130129
def _test_without_processor_class_impl(env, target):

test/java/common/rules/java_binary_tests.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def _test_java_binary_provides_binary_java_info(name):
1818
name = name,
1919
impl = _test_java_binary_provides_binary_java_info_impl,
2020
target = Label(":bin"),
21-
attr_values = {"tags": ["min_bazel_7"]},
2221
)
2322

2423
def _test_java_binary_provides_binary_java_info_impl(env, target):
@@ -150,9 +149,6 @@ def _test_java_binary_propagates_direct_native_libraries(name):
150149
name = name,
151150
impl = _test_java_binary_propagates_direct_native_libraries_impl,
152151
target = name + "/binary",
153-
# in Bazel 6, the windows stub was created by a bespoke, native and
154-
# opaque-to-Starlark LauncherFileWriteAction
155-
attr_values = {"tags": ["min_bazel_7"]},
156152
)
157153

158154
def _test_java_binary_propagates_direct_native_libraries_impl(env, target):

test/java/common/rules/java_import_tests.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,6 @@ def _test_neverlink_is_populated(name):
775775
name = name,
776776
impl = _test_neverlink_is_populated_impl,
777777
target = target_name,
778-
# in Bazel 6, JavaInfo._neverlink isn't exposed to Starlark
779-
attr_values = {"tags": ["min_bazel_7"]},
780778
)
781779

782780
def _test_neverlink_is_populated_impl(env, target):

test/java/common/rules/java_test_tests.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ def _test_java_test_propagates_direct_native_libraries(name):
5656
name = name,
5757
impl = _test_java_test_propagates_direct_native_libraries_impl,
5858
target = name + "/binary",
59-
# in Bazel 6, the windows stub was created by a bespoke, native and
60-
# opaque-to-Starlark LauncherFileWriteAction
61-
attr_values = {"tags": ["min_bazel_7"]},
6259
)
6360

6461
def _test_java_test_propagates_direct_native_libraries_impl(env, target):

test/java/toolchains/java_runtime_tests.bzl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def _test_with_absolute_java_home(name):
3838
config_settings = {
3939
"//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")],
4040
},
41-
# Bazel 6 doesn't accept Label's for the transition above
42-
attr_values = {"tags": ["min_bazel_7"]},
4341
)
4442

4543
def _test_with_absolute_java_home_impl(env, target):
@@ -80,8 +78,6 @@ def _test_with_hermetic_java_home(name):
8078
config_settings = {
8179
"//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")],
8280
},
83-
# Bazel 6 doesn't accept Label's for the transition above
84-
attr_values = {"tags": ["min_bazel_7"]},
8581
)
8682

8783
def _test_with_hermetic_java_home_impl(env, target):
@@ -129,8 +125,6 @@ def _test_with_generated_java_executable(name):
129125
config_settings = {
130126
"//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")],
131127
},
132-
# Bazel 6 doesn't accept Label's for the transition above
133-
attr_values = {"tags": ["min_bazel_7"]},
134128
)
135129

136130
def _test_with_generated_java_executable_impl(env, target):

0 commit comments

Comments
 (0)