diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2019-05-07 11:30:28 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2019-05-07 11:30:28 -0700 |
commit | 20d849a5e03945a5c764f3ffa98a6525378274e9 (patch) | |
tree | 9a45628b618117a0e0868076c45443e571ec5450 /BUILD | |
parent | b08819749e6c2a6d8d771f954f6162933a8ba648 (diff) |
Fixes for Bazel 0.25.
Disabled the conformance tests for now because I didn't push
the necessary changes to the protobuf repo yet.
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD | 78 |
1 files changed, 39 insertions, 39 deletions
@@ -350,45 +350,45 @@ cc_test( copts = CPPOPTS, ) -upb_proto_library( - name = "conformance_proto_upb", - deps = ["@com_google_protobuf//:conformance_proto"], -) - -upb_proto_library( - name = "test_messages_proto3_proto_upb", - deps = ["@com_google_protobuf//:test_messages_proto3_proto"], -) - -cc_binary( - name = "conformance_upb", - srcs = [ - "tests/conformance_upb.c", - ], - copts = COPTS + ["-Ibazel-out/k8-fastbuild/bin"], - deps = [ - ":conformance_proto_upb", - ":test_messages_proto3_proto_upb", - ":upb", - ], -) - -make_shell_script( - name = "gen_test_conformance_upb", - out = "test_conformance_upb.sh", - contents = "$(rlocation com_google_protobuf/conformance_test_runner) $(rlocation upb/conformance_upb)", -) - -sh_test( - name = "test_conformance_upb", - srcs = ["test_conformance_upb.sh"], - data = [ - "tests/conformance_upb_failures.txt", - ":conformance_upb", - "@bazel_tools//tools/bash/runfiles", - "@com_google_protobuf//:conformance_test_runner", - ], -) +#upb_proto_library( +# name = "conformance_proto_upb", +# deps = ["@com_google_protobuf//:conformance_proto"], +#) + +#upb_proto_library( +# name = "test_messages_proto3_proto_upb", +# deps = ["@com_google_protobuf//:test_messages_proto3_proto"], +#) + +#cc_binary( +# name = "conformance_upb", +# srcs = [ +# "tests/conformance_upb.c", +# ], +# copts = COPTS + ["-Ibazel-out/k8-fastbuild/bin"], +# deps = [ +# ":conformance_proto_upb", +# ":test_messages_proto3_proto_upb", +# ":upb", +# ], +#) +# +#make_shell_script( +# name = "gen_test_conformance_upb", +# out = "test_conformance_upb.sh", +# contents = "$(rlocation com_google_protobuf/conformance_test_runner) $(rlocation upb/conformance_upb)", +#) +# +#sh_test( +# name = "test_conformance_upb", +# srcs = ["test_conformance_upb.sh"], +# data = [ +# "tests/conformance_upb_failures.txt", +# ":conformance_upb", +# "@bazel_tools//tools/bash/runfiles", +# "@com_google_protobuf//:conformance_test_runner", +# ], +#) # Amalgamation ################################################################# |