From 551fabdd82d1577d6dbae107c580c74c6f7a00be Mon Sep 17 00:00:00 2001
From: twigg <twigg@google.com>
Date: Wed, 31 Mar 2021 16:19:20 -0700
Subject: [PATCH] Miscellaneous fixes to tests to avoid using --test_arg as
 no-op, etc.

Instead of using --test_arg as a no-op configuration setting, use a garbage cpu value (since not building anyway), define and define_values, or just change the associated targets to test targets (to avoid any trimming for when --trim_test_configuration is on).

These are not BuildViewTestCase so introducing the DummyTestFragment is non-trivial hence the use of 'different' 'no-op' configuration flags.

PiperOrigin-RevId: 366139254
---
 .../build/lib/analysis/AnalysisFailureReportingTest.java      | 4 ++--
 .../com/google/devtools/build/lib/analysis/BuildViewTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisFailureReportingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisFailureReportingTest.java
index ed1302ba41b3c8..6ac172cb6bbb3f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisFailureReportingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisFailureReportingTest.java
@@ -205,7 +205,7 @@ public void testFileVisibilityError() throws Exception {
 
   @Test
   public void testVisibilityErrorNoKeepGoing() throws Exception {
-    scratch.file("foo/BUILD", "sh_library(name = 'foo', deps = ['//bar'])");
+    scratch.file("foo/BUILD", "sh_test(name = 'foo', srcs = ['test.sh'], deps = ['//bar'])");
     scratch.file("bar/BUILD", "sh_library(name = 'bar', visibility = ['//visibility:private'])");
 
     try {
@@ -222,7 +222,7 @@ public void testVisibilityErrorNoKeepGoing() throws Exception {
                 .getBuildConfigurationCollection()
                 .getTargetConfigurations());
     String message =
-        "in sh_library rule //foo:foo: target '//bar:bar' is not visible from"
+        "in sh_test rule //foo:foo: target '//bar:bar' is not visible from"
             + " target '//foo:foo'. Check the visibility declaration of the"
             + " former target if you think the dependency is legitimate";
     assertThat(collector.events.get(topLevel))
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 7af036de8425db..9c6bb7c7bd491d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1083,7 +1083,7 @@ public void testPostProcessedConfigurableAttributes() throws Exception {
     reporter.removeHandler(failFastHandler); // Expect errors from action conflicts.
     scratch.file(
         "conflict/BUILD",
-        "config_setting(name = 'a', values = {'test_arg': 'a'})",
+        "config_setting(name = 'a', values = {'cpu': 'unobtainiumx'})",
         "cc_library(name='x', srcs=select({':a': ['a.cc'], '//conditions:default': ['foo.cc']}))",
         "cc_binary(name='_objs/x/foo.o', srcs=['bar.cc'])");
     AnalysisResult result =