Skip to content

Switch CEL-C++ conformance tests and test protos to depend on cel-conformance repository #2441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Nov 11, 2026
Merged

Switch CEL-C++ conformance tests and test protos to depend on cel-conformance repository #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ git_override(
commit = "6dccde40b346f89761ddb890abc6ca503a453134",
remote = "https://github.com/cel-expr/cel-spec",
)
bazel_dep(
name = "cel-conformance",
version = "0.1.0",
repo_name = "cel_conformance",
)
# TODO(b/582952496): Remove git_override once cel-conformance is published on BCR.
git_override(
module_name = "cel-conformance",
commit = "8d64ec2a2938204e388fc02e8e5102dc8ca16e83",
remote = "https://github.com/cel-expr/cel-conformance",
)

bazel_dep(
name = "platforms",
Expand Down
4 changes: 2 additions & 2 deletions checker/internal/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ cc_test(
"//parser:macro_registry",
"//testutil:baseline_tests",
"//testutil:test_macros",
"@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_absl//absl/base:no_destructor",
"@com_google_absl//absl/base:nullability",
"@com_google_absl//absl/container:flat_hash_set",
Expand All @@ -209,8 +211,6 @@ cc_test(
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_protobuf//:protobuf",
],
)
Expand Down
4 changes: 2 additions & 2 deletions checker/internal/type_checker_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "checker/checker_options.h"
#include "checker/internal/test_ast_helpers.h"
#include "checker/internal/type_check_env.h"
Expand All @@ -52,8 +54,6 @@
#include "parser/parser.h"
#include "testutil/baseline_tests.h"
#include "testutil/test_macros.h"
#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/arena.h"
#include "google/protobuf/message.h"
#include "google/protobuf/text_format.h"
Expand Down
6 changes: 3 additions & 3 deletions common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ cc_test(
":format_type_name",
":type",
"//internal:testing",
"@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@com_google_protobuf//:protobuf",
],
)
Expand Down Expand Up @@ -842,6 +842,8 @@ cc_test(
"//internal:testing_message_factory",
"//runtime:runtime_options",
"//runtime/internal:errors",
"@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/base:nullability",
"@com_google_absl//absl/functional:function_ref",
Expand All @@ -856,8 +858,6 @@ cc_test(
"@com_google_absl//absl/strings:string_view",
"@com_google_absl//absl/time",
"@com_google_absl//absl/types:optional",
"@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_protobuf//:field_mask_cc_proto",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:struct_cc_proto",
Expand Down
2 changes: 1 addition & 1 deletion common/format_type_name_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

#include "common/format_type_name.h"

#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "common/type.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "google/protobuf/arena.h"

namespace cel {
Expand Down
4 changes: 2 additions & 2 deletions common/value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#include "absl/status/status.h"
#include "absl/status/status_matchers.h"
#include "absl/types/optional.h"
#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/type.h"
#include "common/value_testing.h"
#include "internal/parse_text_proto.h"
#include "internal/testing.h"
#include "internal/testing_descriptor_pool.h"
#include "internal/testing_message_factory.h"
#include "cel/expr/conformance/proto2/test_all_types.pb.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/arena.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/dynamic_message.h"
Expand Down
2 changes: 1 addition & 1 deletion common/values/legacy_struct_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "absl/status/status.h"
#include "absl/status/status_matchers.h"
#include "absl/strings/string_view.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/legacy_value.h"
#include "common/value.h"
#include "common/value_testing.h"
Expand All @@ -31,7 +32,6 @@
#include "eval/public/structs/proto_message_type_adapter.h"
#include "internal/testing.h"
#include "runtime/runtime_options.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"

namespace cel {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion common/values/message_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
#include "absl/status/status_matchers.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "base/attribute.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

namespace cel {
Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_json_list_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#include "absl/status/status_matchers.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/memory.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/parse_text_proto.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/arena.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_json_map_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/memory.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

namespace cel {
Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_json_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include "google/protobuf/struct.pb.h"
#include "absl/strings/string_view.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/value_testing.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"

namespace cel::common_internal {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_map_field_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/memory.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

namespace cel {
Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_message_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
#include "absl/status/status_matchers.h"
#include "absl/strings/cord.h"
#include "absl/strings/string_view.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "base/attribute.h"
#include "common/memory.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

namespace cel {
Expand Down
2 changes: 1 addition & 1 deletion common/values/parsed_repeated_field_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/memory.h"
#include "common/type.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "common/value_testing.h"
#include "internal/parse_text_proto.h"
#include "internal/testing.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/arena.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"

Expand Down
2 changes: 1 addition & 1 deletion common/values/struct_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
// limitations under the License.

#include "absl/base/attributes.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "common/value.h"
#include "internal/parse_text_proto.h"
#include "internal/testing.h"
#include "internal/testing_descriptor_pool.h"
#include "internal/testing_message_factory.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "google/protobuf/arena.h"

namespace cel {
Expand Down
2 changes: 1 addition & 1 deletion compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ cc_test(
"//internal:testing",
"//internal:testing_descriptor_pool",
"//testutil:baseline_tests",
"@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
],
)

Expand Down
2 changes: 1 addition & 1 deletion compiler/optional_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "absl/strings/ascii.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"
#include "checker/optional.h"
#include "checker/standard_library.h"
#include "checker/type_check_issue.h"
Expand All @@ -37,7 +38,6 @@
#include "internal/testing.h"
#include "internal/testing_descriptor_pool.h"
#include "testutil/baseline_tests.h"
#include "cel/expr/conformance/proto3/test_all_types.pb.h"

namespace cel {
namespace {
Expand Down
68 changes: 34 additions & 34 deletions conformance/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ cc_library(
"//runtime:runtime_options",
"//runtime:standard_runtime_builder_factory",
"//testutil:test_macros",
"@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
"@com_google_googleapis//google/api/expr/conformance/v1alpha1:conformance_cc_proto",
"@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto",
"@com_google_googleapis//google/rpc:code_cc_proto",
Expand All @@ -101,6 +101,7 @@ cc_library(
":utils",
"//internal:runfiles",
"//internal:testing_no_main",
"@cel_conformance//proto/cel/expr/conformance/test:simple_cc_proto",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/status",
Expand All @@ -110,7 +111,6 @@ cc_library(
"@com_google_absl//absl/types:span",
"@com_google_cel_spec//proto/cel/expr:checked_cc_proto",
"@com_google_cel_spec//proto/cel/expr:value_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/test:simple_cc_proto",
"@com_google_googleapis//google/api/expr/conformance/v1alpha1:conformance_cc_proto",
"@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto",
"@com_google_googleapis//google/rpc:code_cc_proto",
Expand All @@ -136,37 +136,37 @@ cc_library(
)

_ALL_TESTS = [
"@com_google_cel_spec//tests/simple:testdata/basic.textproto",
"@com_google_cel_spec//tests/simple:testdata/bindings_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/comparisons.textproto",
"@com_google_cel_spec//tests/simple:testdata/conversions.textproto",
"@com_google_cel_spec//tests/simple:testdata/dynamic.textproto",
"@com_google_cel_spec//tests/simple:testdata/encoders_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/enums.textproto",
"@com_google_cel_spec//tests/simple:testdata/fields.textproto",
"@com_google_cel_spec//tests/simple:testdata/fp_math.textproto",
"@com_google_cel_spec//tests/simple:testdata/integer_math.textproto",
"@com_google_cel_spec//tests/simple:testdata/lists.textproto",
"@com_google_cel_spec//tests/simple:testdata/lists_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/logic.textproto",
"@com_google_cel_spec//tests/simple:testdata/macros.textproto",
"@com_google_cel_spec//tests/simple:testdata/macros2.textproto",
"@com_google_cel_spec//tests/simple:testdata/math_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/namespace.textproto",
"@com_google_cel_spec//tests/simple:testdata/optionals.textproto",
"@com_google_cel_spec//tests/simple:testdata/parse.textproto",
"@com_google_cel_spec//tests/simple:testdata/plumbing.textproto",
"@com_google_cel_spec//tests/simple:testdata/proto2.textproto",
"@com_google_cel_spec//tests/simple:testdata/proto2_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/proto3.textproto",
"@com_google_cel_spec//tests/simple:testdata/string.textproto",
"@com_google_cel_spec//tests/simple:testdata/string_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/timestamps.textproto",
"@com_google_cel_spec//tests/simple:testdata/unknowns.textproto",
"@com_google_cel_spec//tests/simple:testdata/wrappers.textproto",
"@com_google_cel_spec//tests/simple:testdata/block_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/sets_ext.textproto",
"@com_google_cel_spec//tests/simple:testdata/type_deduction.textproto",
"@cel_conformance//tests/simple:testdata/basic.textproto",
"@cel_conformance//tests/simple:testdata/bindings_ext.textproto",
"@cel_conformance//tests/simple:testdata/comparisons.textproto",
"@cel_conformance//tests/simple:testdata/conversions.textproto",
"@cel_conformance//tests/simple:testdata/dynamic.textproto",
"@cel_conformance//tests/simple:testdata/encoders_ext.textproto",
"@cel_conformance//tests/simple:testdata/enums.textproto",
"@cel_conformance//tests/simple:testdata/fields.textproto",
"@cel_conformance//tests/simple:testdata/fp_math.textproto",
"@cel_conformance//tests/simple:testdata/integer_math.textproto",
"@cel_conformance//tests/simple:testdata/lists.textproto",
"@cel_conformance//tests/simple:testdata/lists_ext.textproto",
"@cel_conformance//tests/simple:testdata/logic.textproto",
"@cel_conformance//tests/simple:testdata/macros.textproto",
"@cel_conformance//tests/simple:testdata/macros2.textproto",
"@cel_conformance//tests/simple:testdata/math_ext.textproto",
"@cel_conformance//tests/simple:testdata/namespace.textproto",
"@cel_conformance//tests/simple:testdata/optionals.textproto",
"@cel_conformance//tests/simple:testdata/parse.textproto",
"@cel_conformance//tests/simple:testdata/plumbing.textproto",
"@cel_conformance//tests/simple:testdata/proto2.textproto",
"@cel_conformance//tests/simple:testdata/proto2_ext.textproto",
"@cel_conformance//tests/simple:testdata/proto3.textproto",
"@cel_conformance//tests/simple:testdata/string.textproto",
"@cel_conformance//tests/simple:testdata/string_ext.textproto",
"@cel_conformance//tests/simple:testdata/timestamps.textproto",
"@cel_conformance//tests/simple:testdata/unknowns.textproto",
"@cel_conformance//tests/simple:testdata/wrappers.textproto",
"@cel_conformance//tests/simple:testdata/block_ext.textproto",
"@cel_conformance//tests/simple:testdata/sets_ext.textproto",
"@cel_conformance//tests/simple:testdata/type_deduction.textproto",
]

_TESTS_TO_SKIP = [
Expand Down
2 changes: 1 addition & 1 deletion conformance/policy/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ cc_library(
"//runtime:activation",
"//runtime:bind_proto_to_activation",
"//runtime:function_adapter",
"@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_cel_spec//proto/cel/expr:value_cc_proto",
"@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto",
"@com_google_protobuf//:protobuf",
],
alwayslink = True,
Expand Down
Loading
Loading