commit cd12f77b14883b61f215898063b4ac679e468553
author Vladimir Moskva <vladmos@google.com> Tue Jan 10 12:47:06 2017 +0000
committer Marcel Hlopko <hlopko@google.com> Tue Jan 10 13:19:17 2017 +0000
tree a1ea9cfc24caa31f12265c3f8e39a1e7c5c11489
parent df2e6cbd37348b65c3fff55b7f7a7ff1c02b7082

Deprecated and removed HOST_CFG and DATA_CFG global variables.

RELNOTES[INC]: Deprecated globals HOST_CFG and DATA_CFG are removed. Use strings "host" and "data" instead.

--
PiperOrigin-RevId: 144069794
MOS_MIGRATED_REVID=144069794

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

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 682d987..8c6df5b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -683,8 +683,8 @@
   public void testTextMessageInvalidStructure() throws Exception {
     checkErrorContains(
         "Invalid text format, expected a struct, a string, a bool, or an int "
-            + "but got a ConfigurationTransition for struct field 'a'",
-        "struct(a=DATA_CFG).to_proto()");
+            + "but got a function for struct field 'a'",
+        "struct(a=rule).to_proto()");
   }
 
   private void checkJson(String from, String expected) throws Exception {
@@ -730,8 +730,8 @@
   public void testJsonInvalidStructure() throws Exception {
     checkErrorContains(
         "Invalid text format, expected a struct, a string, a bool, or an int but got a "
-            + "ConfigurationTransition for struct field 'a'",
-        "struct(a=DATA_CFG).to_json()");
+            + "function for struct field 'a'",
+        "struct(a=rule).to_json()");
   }
 
   @Test