瀏覽代碼

Move ASAN_OPTIONS to executable_semantics, local to the leak. (#672)

Jon Meow 4 年之前
父節點
當前提交
f35cda7a99
共有 2 個文件被更改,包括 13 次插入5 次删除
  1. 5 5
      bazel/testing/golden_test.bzl
  2. 8 0
      executable_semantics/BUILD

+ 5 - 5
bazel/testing/golden_test.bzl

@@ -4,7 +4,7 @@
 
 """Rule for a golden test."""
 
-def golden_test(name, golden, cmd, data, golden_is_subset = False, **kwargs):
+def golden_test(name, golden, cmd, data, env = None, golden_is_subset = False, **kwargs):
     """Compares two files. Passes if they are identical.
 
     Args:
@@ -12,11 +12,14 @@ def golden_test(name, golden, cmd, data, golden_is_subset = False, **kwargs):
       cmd: The command whose output is being tested.
       golden: The golden file to be compared against the command output.
       data: Data files.
+      env: Optional environment.
       golden_is_subset: Set to True if the golden file should be a subset of
         command output.
       **kwargs: Any additional parameters for the generated py_test.
     """
     args = ["$(location %s)" % golden, cmd]
+    if not env:
+        env = {}
     if golden_is_subset:
         args.append("--golden_is_subset")
     native.py_test(
@@ -25,9 +28,6 @@ def golden_test(name, golden, cmd, data, golden_is_subset = False, **kwargs):
         main = "//bazel/testing:golden_test.py",
         args = args,
         data = [golden] + data,
-        env = {
-            # TODO(#580): Remove this when leaks are fixed.
-            "ASAN_OPTIONS": "detect_leaks=0",
-        },
+        env = env,
         **kwargs
     )

+ 8 - 0
executable_semantics/BUILD

@@ -106,6 +106,10 @@ EXAMPLES = [
         ":executable_semantics",
         "testdata/%s.carbon" % e,
     ],
+    env = {
+        # TODO(#580): Remove this when leaks are fixed.
+        "ASAN_OPTIONS": "detect_leaks=0",
+    },
     golden = "testdata/%s.golden" % e,
 ) for e in EXAMPLES]
 
@@ -119,6 +123,10 @@ EXAMPLES = [
         ":executable_semantics",
         "testdata/%s.carbon" % e,
     ],
+    env = {
+        # TODO(#580): Remove this when leaks are fixed.
+        "ASAN_OPTIONS": "detect_leaks=0",
+    },
     golden = "testdata/%s.golden" % e,
     golden_is_subset = True,
 ) for e in EXAMPLES]