From d13207c8da178025d56df37a497092b3de971b3a Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 4 Sep 2015 14:53:43 +0000 Subject: Inject the default runfiles prefix from the rule class provider. -- MOS_MIGRATED_REVID=102341264 --- .../java/com/google/devtools/build/lib/packages/RuleClassTest.java | 2 +- .../devtools/build/lib/packages/util/PackageFactoryApparatus.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/packages') 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 8b1a19880e..8923373497 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 @@ -205,7 +205,7 @@ public class RuleClassTest extends PackageLoadingTestCase { } private Package.Builder createDummyPackageBuilder() { - return new Builder(PackageIdentifier.createInDefaultRepo(TEST_PACKAGE_NAME)) + return new Builder(PackageIdentifier.createInDefaultRepo(TEST_PACKAGE_NAME), "TESTING") .setFilename(testBuildfilePath) .setMakeEnv(new MakeEnvironment.Builder()); } 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 84c401db46..24ac455762 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 @@ -129,8 +129,8 @@ public class PackageFactoryApparatus { GlobCache globCache = new GlobCache( buildFile.getParentDirectory(), packageId, locator, null, TestUtils.getPool()); LegacyGlobber globber = new LegacyGlobber(globCache); - ExternalPackage externalPkg = (new ExternalPackage.Builder( - buildFile.getParentDirectory().getRelative("WORKSPACE"))).build(); + ExternalPackage externalPkg = new ExternalPackage.Builder( + buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING").build(); LegacyBuilder resultBuilder = factory.evaluateBuildFile( externalPkg, packageId, buildFileAST, buildFile, globber, ImmutableList.of(), ConstantRuleVisibility.PUBLIC, false, false, -- cgit v1.2.3