commit 0c6a2cac72a3e3fc9df0cb65dc2d0e375ad31cd0
author juliexxia <juliexxia@google.com> Thu Mar 21 13:34:14 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 21 13:36:03 2019 -0700
tree dce3579f7d618001a64286b606bc182448b6f910
parent af6b179881a0baa41d6115f7464fbb39d6c95028

Amend some error messages for starlark transition whitelisting to reflect not always being split transitions.

RELNOTES: None.
PiperOrigin-RevId: 239661406

src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index 0c358e2..b4b890c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -718,7 +718,7 @@
           throw new EvalException(
               location,
               String.format(
-                  "Use of function-based split transition without whitelist: %s %s",
+                  "Use of Starlark transition without whitelist: %s %s",
                   builder.getRuleDefinitionEnvironmentLabel(), builder.getType()));
         }
       } else {

src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java
index 451738e..59fde8e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java
@@ -619,6 +619,6 @@
 
     reporter.removeHandler(failFastHandler);
     getConfiguredTarget("//test");
-    assertContainsEvent("Use of function-based split transition without whitelist");
+    assertContainsEvent("Use of Starlark transition without whitelist");
   }
 }

src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
index 4ba3f7b..0f7c4eb 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -2623,7 +2623,7 @@
 
     reporter.removeHandler(failFastHandler);
     getConfiguredTarget("//test:my_rule");
-    assertContainsEvent("Use of function-based split transition without whitelist");
+    assertContainsEvent("Use of Starlark transition without whitelist");
   }
 
   @Test