diff options
| author |  Harmandeep Kaur <write.harmandeep@gmail.com> | 2017-04-10 14:33:09 +0000 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-04-11 10:49:45 +0200 |
| commit | 505ef57569b9cceb658d825de9ca47b5cc1d96ca (patch) | |
| tree | d0996c9486f5e073916a5978eccc0890e7de6799 /src/test/java/com/google/devtools | |
| parent | 07fbeaea1d7759e3c03def5ccc031a70f4218ae6 (diff) | |
fix: Allow parentheses in glob patterns
More info here #2583
Closes #2679.
PiperOrigin-RevId: 152685327
Diffstat (limited to 'src/test/java/com/google/devtools')
4 files changed, 1 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java index 4d120c1833..5b9beafeaa 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java @@ -123,8 +123,7 @@ public class GlobCacheTest { @Test public void testSafeGlobInvalidPatterns() throws Exception { - for (String pattern : new String[] { - "Foo?.txt", "List{Test}.py", "List(Test).py" }) { + for (String pattern : new String[] {"Foo?.txt", "List{Test}.py"}) { try { cache.safeGlobUnsorted(pattern, false); fail("Expected pattern " + pattern + " to fail"); diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java index 7ab592eccf..2cff49ba29 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java @@ -787,7 +787,6 @@ public class PackageFactoryTest extends PackageFactoryTestBase { @Test public void testBadCharactersInGlob() throws Exception { events.setFailFast(false); - assertGlobFails("glob(['('])", "illegal character"); assertGlobFails("glob(['{'])", "illegal character"); assertGlobFails("glob(['?'])", "illegal character"); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index 27abfaa775..ef865acbff 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java @@ -407,7 +407,6 @@ public abstract class GlobFunctionTest { @Test public void testIllegalPatterns() throws Exception { - assertIllegalPattern("(illegal) pattern"); assertIllegalPattern("[illegal pattern"); assertIllegalPattern("}illegal pattern"); assertIllegalPattern("foo**bar"); diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java index 34cfcc2db2..430078ae86 100644 --- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java +++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java @@ -208,7 +208,6 @@ public class GlobTest { @Test public void testIllegalPatterns() throws Exception { - assertIllegalPattern("(illegal) pattern"); assertIllegalPattern("[illegal pattern"); assertIllegalPattern("}illegal pattern"); assertIllegalPattern("foo**bar"); |