From cbe051a09c19f868b7682477755011ec681ce6cb Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Mon, 13 May 2019 08:30:57 -0700
Subject: Re-enabled conformance tests.

---
 BUILD | 78 +++++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

(limited to 'BUILD')

diff --git a/BUILD b/BUILD
index 2f03ae3..6ad365e 100644
--- a/BUILD
+++ b/BUILD
@@ -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 #################################################################
 
-- 
cgit v1.2.3