diff options
author | 2018-03-23 03:06:27 -0700 | |
---|---|---|
committer | 2018-03-23 03:07:25 -0700 | |
commit | 3ef288c0cf49783399c60ed9a33dcd98f3ae1210 (patch) | |
tree | f3e04fd8667549b7c27e4af2c041d79fd98e163b /src/test/java/com/google/devtools/build/lib/packages | |
parent | 871d9f54dd45fd6383b60278788fb44bee7fd55c (diff) |
Victory lap: Remove all code that used to support the three-argument form of vardef().
RELNOTES: None.
PiperOrigin-RevId: 190196933
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
3 files changed, 5 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java index 4e33a396c2..c3ae5f91cc 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java @@ -252,8 +252,7 @@ public class RuleClassTest extends PackageLoadingTestCase { private Package.Builder createDummyPackageBuilder() { return packageFactory.newPackageBuilder( PackageIdentifier.createInMainRepo(TEST_PACKAGE_NAME), "TESTING") - .setFilename(testBuildfilePath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(testBuildfilePath); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java index 8b76f7fce1..3c78b8eb3e 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java @@ -49,8 +49,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/mypkg/BUILD"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -136,8 +135,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/mypkg/BUILD"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -165,8 +163,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/WORKSPACE"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(Label.EXTERNAL_PACKAGE_IDENTIFIER, "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -207,8 +204,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("outs", Lists.newArrayList(".")); @@ -243,7 +239,6 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Package pkg = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()) .build(); for (String name : ruleFactory.getRuleClassNames()) { 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 742f616496..b39e3cc536 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 @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.packages.AttributeContainer; import com.google.devtools.build.lib.packages.CachingPackageLocator; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.GlobCache; -import com.google.devtools.build.lib.packages.MakeEnvironment; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.Package.Builder; @@ -58,7 +57,6 @@ public class PackageFactoryApparatus { factory = new PackageFactory( ruleClassProvider, - null, AttributeContainer::new, ImmutableList.copyOf(environmentExtensions), "test", @@ -145,7 +143,6 @@ public class PackageFactoryApparatus { ConstantRuleVisibility.PUBLIC, SkylarkSemantics.DEFAULT_SEMANTICS, false, - new MakeEnvironment.Builder(), ImmutableMap.<String, Extension>of(), ImmutableList.<Label>of()); Package result; |