diff options
author | 2016-08-03 13:16:02 +0000 | |
---|---|---|
committer | 2016-08-03 17:15:41 +0000 | |
commit | f1112b3a7a6d974b897147b9b0f9e257a1748c1b (patch) | |
tree | 24e9dfdfa17ed79e28cdbdcfa151fb837b7b01c4 /src/test/java/com/google/devtools/build | |
parent | deee73f24883df51a65248c9409f51531739c498 (diff) |
Start removing the parsePython boolean
It's still used in one place and should be removed completely in October.
--
MOS_MIGRATED_REVID=129207133
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java | 3 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java index ddda9ff709..b3740c8f8c 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java @@ -36,7 +36,6 @@ import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.Path; - import java.io.IOException; /** @@ -106,7 +105,7 @@ public class PackageFactoryApparatus { */ public BuildFileAST ast(Path buildFile) throws IOException { ParserInputSource inputSource = ParserInputSource.create(buildFile); - return BuildFileAST.parseBuildFile(inputSource, eventHandler, /*parsePython=*/ false); + return BuildFileAST.parseBuildFile(inputSource, eventHandler); } /** diff --git a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java index 20c344d46c..20d5165a26 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java @@ -25,13 +25,11 @@ import com.google.devtools.build.lib.syntax.util.EvaluationTestCase; import com.google.devtools.build.lib.testutil.MoreAsserts; import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.vfs.Path; - +import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; - /** * Unit tests for BuildFileAST. */ @@ -51,7 +49,7 @@ public class BuildFileASTTest extends EvaluationTestCase { */ private BuildFileAST parseBuildFile(String... lines) throws IOException { Path file = scratch.file("/a/build/file/BUILD", lines); - return BuildFileAST.parseBuildFile(file, getEventHandler(), false); + return BuildFileAST.parseBuildFile(file, getEventHandler()); } @Test @@ -61,7 +59,7 @@ public class BuildFileASTTest extends EvaluationTestCase { "", "x = [1,2,'foo',4] + [1,2, \"%s%d\" % ('foo', 1)]"); - BuildFileAST buildfile = BuildFileAST.parseBuildFile(buildFile, getEventHandler(), false); + BuildFileAST buildfile = BuildFileAST.parseBuildFile(buildFile, getEventHandler()); assertTrue(buildfile.exec(env, getEventHandler())); @@ -82,7 +80,7 @@ public class BuildFileASTTest extends EvaluationTestCase { "z = x + y"); setFailFast(false); - BuildFileAST buildfile = BuildFileAST.parseBuildFile(buildFile, getEventHandler(), false); + BuildFileAST buildfile = BuildFileAST.parseBuildFile(buildFile, getEventHandler()); assertFalse(buildfile.exec(env, getEventHandler())); Event e = assertContainsError("unsupported operand type(s) for +: 'int' and 'list'"); |