commit 93ed7f114ee9be35f41eff5476963745baae4c12
author Francois-Rene Rideau <tunes@google.com> Tue Oct 20 15:39:33 2015 +0000
committer Philipp Wollermann <philwo@google.com> Tue Oct 20 16:38:43 2015 +0000
tree dacfd5648430e8c1349a573f80d077f6f0e76f5a
parent 67f14b82563757a79c92b79a49e8ade63a92ec3e

Unify Skylark and BUILD lists

Use SkylarkList everywhere rather than either List or GlobList.
Keep a GlobList underneath a MutableList, where applicable.

--
MOS_MIGRATED_REVID=105864035

src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index f956f94..eb0f095 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -917,7 +917,7 @@
 
   @Test
   public void testListAnTupleConcatenationDoesNotWorkInSkylark() throws Exception {
-    new SkylarkTest().testIfExactError("can only concatenate list (not \"tuple\") to list",
+    new SkylarkTest().testIfExactError("unsupported operand type(s) for +: 'list' and 'tuple'",
         "[1, 2] + (3, 4)");
   }