diff --git a/conformance/BUILD b/conformance/BUILD index 726a11b0b..9b527cf35 100644 --- a/conformance/BUILD +++ b/conformance/BUILD @@ -201,26 +201,6 @@ _TESTS_TO_SKIP = [ # precision to preserve value. Not available on older compilers where we just use absl::Format. # We should probably update the spec to allow different formats that parse to the same value. "conversions/string/double_hard", - - # Recent changes - "proto2/set_null/repeated_field_timestamp_null_pruned", - "proto2/set_null/repeated_field_duration_null_pruned", - "proto2/set_null/repeated_field_wrapper_null_pruned", - "proto2/set_null/map_timestamp_null_pruned", - "proto2/set_null/map_duration_null_pruned", - "proto2/set_null/map_wrapper_null_pruned", - "proto3/set_null/repeated_field_timestamp_null_pruned", - "proto3/set_null/repeated_field_duration_null_pruned", - "proto3/set_null/repeated_field_wrapper_null_pruned", - "proto3/set_null/map_timestamp_null_pruned", - "proto3/set_null/map_duration_null_pruned", - "proto3/set_null/map_wrapper_null_pruned", - "string_ext/format/default precision for fixed-point clause with int", - "string_ext/format/default precision for fixed-point clause with uint", - "string_ext/format/default precision for scientific notation with int", - "string_ext/format/default precision for scientific notation with uint", - "namespace/namespace_shadowing/basic", - "namespace/namespace_shadowing/comprehension_shadowing_namespaced_selector_disambiguation", ] _TESTS_TO_SKIP_MODERN = _TESTS_TO_SKIP diff --git a/conformance/run.bzl b/conformance/run.bzl index d53fd539c..4fcf325c6 100644 --- a/conformance/run.bzl +++ b/conformance/run.bzl @@ -70,7 +70,7 @@ def _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, args.append("--skip_check") else: args.append("--noskip_check") - args.append("--skip_tests=\"{}\"".format(",".join(_expand_tests_to_skip(skip_tests)))) + args.append("--skip_tests={}".format(",".join(_expand_tests_to_skip(skip_tests)))) if dashboard: args.append("--dashboard") return args @@ -80,8 +80,8 @@ def _conformance_test(name, data, modern, optimize, recursive, select_opt, skip_ name = _conformance_test_name(name, optimize, recursive), args = _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, skip_tests, dashboard) + ["$(location " + test + ")" for test in data] + select( { - "@platforms//os:windows": ["--skip_tests=\"{}\"".format(",".join(skip_tests + _TESTS_TO_SKIP_WINDOWS))], - "//conditions:default": ["--skip_tests=\"{}\"".format(",".join(skip_tests))], + "@platforms//os:windows": ["--skip_tests={}".format(",".join(skip_tests + _TESTS_TO_SKIP_WINDOWS))], + "//conditions:default": ["--skip_tests={}".format(",".join(skip_tests))], }, ), data = data,