Changed build file to have proper golden test targets (#72)

PiperOrigin-RevId: 468293606

Co-authored-by: PINS Team <copybara-servicebot@google.com>

Author: verios-google

e2e_tests/p4check.bzl

@@ -153,3 +153,20 @@ To auto-generate or update, run `bazel run <target> -- --update`.
         ),
     },
 )
+
+def cmd_diff_test(name, actual_cmd, expected, tools = [], data = [], visibility = None):
+    """Runs a command to get the actual output, to compare against `expected`."""
+    native.genrule(
+        name = name + "_output",
+        visibility = visibility,
+        srcs = data,
+        outs = [name + ".actual"],
+        tools = tools,
+        cmd = actual_cmd + " > '$@'",
+        testonly = True,
+    )
+    diff_test(
+        name = name,
+        actual = name + ".actual",
+        expected = expected,
+    )

gutils/BUILD.bazel

@@ -79,9 +79,7 @@ cc_library(
         "ordered_map.h",
     ],
     visibility = ["//visibility:public"],
-    deps = [
-        "@com_google_absl//absl/container:btree",
-    ],
+    deps = ["@com_google_absl//absl/container:btree"],
 )
 
 cc_library(

p4_constraints/backend/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//third_party/p4lang_p4_constraints/e2e_tests:p4check.bzl", "diff_test")
+load("//third_party/p4lang_p4_constraints/e2e_tests:p4check.bzl", "cmd_diff_test")
 
 package(
     default_visibility = ["//visibility:public"],
@@ -88,16 +88,18 @@ cc_library(
     ],
 )
 
-cc_binary(
+# go/golden-test-with-coverage
+cc_test(
     name = "interpreter_golden_test_runner",
-    testonly = True,
     srcs = ["interpreter_golden_test_runner.cc"],
+    linkstatic = True,
     deps = [
         ":constraint_info",
         ":interpreter",
         "//gutils:ordered_map",
         "//gutils:parse_text_proto",
         "//gutils:status",
+        "//net/proto2/io/public:io",
         "//p4_constraints:ast_cc_proto",
         "//p4_constraints/frontend:lexer",
         "//p4_constraints/frontend:parser",
@@ -108,18 +110,11 @@ cc_binary(
     ],
 )
 
-genrule(
-    name = "interpreter_golden_test_runner_output",
-    testonly = True,
-    outs = ["interpreter_golden_test_runner.output"],
-    cmd = "$(location :interpreter_golden_test_runner) > $(OUTS)",
-    tools = [":interpreter_golden_test_runner"],
-)
-
-diff_test(
+cmd_diff_test(
     name = "interpreter_golden_test",
-    actual = ":interpreter_golden_test_runner_output",
-    expected = "interpreter_golden_test_runner.expected",
+    actual_cmd = "$(execpath :interpreter_golden_test_runner)",
+    expected = ":interpreter_golden_test_runner.expected",
+    tools = [":interpreter_golden_test_runner"],
 )
 
 cc_test(