From f1475299afd41815c78c3768253468ea622669f3 Mon Sep 17 00:00:00 2001
From: Samuel Freilich <sfreilich@google.com>
Date: Fri, 4 Oct 2019 11:19:43 -0400
Subject: [PATCH] Avoid some repetition in _make_analysis_test (#197)

---
 lib/unittest.bzl | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/unittest.bzl b/lib/unittest.bzl
index 986a807..873d8f0 100644
--- a/lib/unittest.bzl
+++ b/lib/unittest.bzl
@@ -193,20 +193,18 @@ def _make_analysis_test(
     if expect_failure:
         changed_settings["//command_line_option:allow_analysis_failures"] = "True"
 
+    target_attr_kwargs = {}
     if changed_settings:
         test_transition = analysis_test_transition(
             settings = changed_settings,
         )
-        attrs["target_under_test"] = attr.label(
-            aspects = [_action_retrieving_aspect],
-            cfg = test_transition,
-            mandatory = True,
-        )
-    else:
-        attrs["target_under_test"] = attr.label(
-            aspects = [_action_retrieving_aspect],
-            mandatory = True,
-        )
+        target_attr_kwargs["cfg"] = test_transition
+
+    attrs["target_under_test"] = attr.label(
+        aspects = [_action_retrieving_aspect],
+        mandatory = True,
+        **target_attr_kwargs
+    )
 
     return rule(
         impl,