diff options
| author |  Carmi Grushko <carmi@google.com> | 2017-02-20 22:37:15 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-02-21 11:48:20 +0000 |
| commit | 46bf88c7e718966f7bafb720543c342d7413ae44 (patch) | |
| tree | 0207d17da0cc51d0035dffaadd872b8603b11442 /src/test/java/com/google | |
| parent | 54b9d2c3d514c7023948930a86db88178309149a (diff) | |
parseBuildString doesn't crash on files with hash lines.
--
PiperOrigin-RevId: 148042501
MOS_MIGRATED_REVID=148042501
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java | 16 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java index 1d93eb92b0..17599d785a 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java @@ -353,15 +353,15 @@ public class MethodLibraryTest extends EvaluationTestCase { .testIfErrorContains( "Traceback (most recent call last):" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 8" + + "\tFile \"\", line 8" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 2, in foo" + + "\tFile \"\", line 2, in foo" + LINE_SEPARATOR + "\t\tbar(1)" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 7, in bar" + + "\tFile \"\", line 7, in bar" + LINE_SEPARATOR + "\t\t'test'.index(x)", "def foo():", @@ -378,11 +378,11 @@ public class MethodLibraryTest extends EvaluationTestCase { public void testStackTraceWithIf() throws Exception { new SkylarkTest() .testIfErrorContains( - "File \"<unknown>\", line 5" + "File \"\", line 5" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 3, in foo" + + "\tFile \"\", line 3, in foo" + LINE_SEPARATOR + "\t\ts[0]", "def foo():", @@ -411,15 +411,15 @@ public class MethodLibraryTest extends EvaluationTestCase { .testIfExactError( "Traceback (most recent call last):" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 6" + + "\tFile \"\", line 6" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 2, in foo" + + "\tFile \"\", line 2, in foo" + LINE_SEPARATOR + "\t\tbar(1)" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 5, in bar" + + "\tFile \"\", line 5, in bar" + LINE_SEPARATOR + "\t\t'test'.index(x)" + LINE_SEPARATOR 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 c2d602453c..0a701e0e5c 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 @@ -421,7 +421,7 @@ public class SkylarkEvaluationTest extends EvaluationTest { " xs.append(4)", " return ys" // No file name in message, due to how test is set up. - ).testIfErrorContains("Object locked at the following location(s): 4:3, 5:5", "foo()"); + ).testIfErrorContains("Object locked at the following location(s): :4:3, :5:5", "foo()"); } @Test |