diff options
author | 2016-03-17 09:53:39 +0000 | |
---|---|---|
committer | 2016-03-17 10:08:22 +0000 | |
commit | d7d6d62983be116c5e7ce82d73f0afc5f4908b06 (patch) | |
tree | 7286b6045b374a72870d7d9c7e07bb789177cb93 /src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | |
parent | eef38fc37aefc1f37743e18e0dcd520b765d8efd (diff) |
Don't keep packages in the default repository around after loading.
Previously, this would get thrown when referring to the same package
from both the main and default repositories:
java.lang.IllegalArgumentException: Multiple entries with same key: tools/cpp=/home/brian/971-Robot-Code and tools/cpp=/home/brian/971-Robot-Code
at com.google.common.collect.ImmutableMap.checkNoConflict(ImmutableMap.java:136)
at com.google.common.collect.RegularImmutableMap.checkNoConflictInKeyBucket(RegularImmutableMap.java:98)
at com.google.common.collect.RegularImmutableMap.fromEntryArray(RegularImmutableMap.java:84)
at com.google.common.collect.ImmutableMap$Builder.build(ImmutableMap.java:295)
at com.google.devtools.build.lib.buildtool.BuildTool.transformPackageRoots(BuildTool.java:301)
at com.google.devtools.build.lib.buildtool.BuildTool.buildTargets(BuildTool.java:209)
at com.google.devtools.build.lib.buildtool.BuildTool.processRequest(BuildTool.java:334)
at com.google.devtools.build.lib.runtime.commands.TestCommand.doTest(TestCommand.java:119)
at com.google.devtools.build.lib.runtime.commands.TestCommand.exec(TestCommand.java:104)
at com.google.devtools.build.lib.runtime.BlazeCommandDispatcher.exec(BlazeCommandDispatcher.java:371)
at com.google.devtools.build.lib.runtime.BlazeRuntime$3.exec(BlazeRuntime.java:1016)
at com.google.devtools.build.lib.server.RPCService.executeRequest(RPCService.java:65)
at com.google.devtools.build.lib.server.RPCServer.executeRequest(RPCServer.java:434)
at com.google.devtools.build.lib.server.RPCServer.serve(RPCServer.java:229)
at com.google.devtools.build.lib.runtime.BlazeRuntime.serverMain(BlazeRuntime.java:975)
at com.google.devtools.build.lib.runtime.BlazeRuntime.main(BlazeRuntime.java:772)
at com.google.devtools.build.lib.bazel.BazelMain.main(BazelMain.java:55)
And this would get thrown for any packages in the main repository loaded
from other repositories:
java.lang.RuntimeException: Unrecoverable error while evaluating node 'PACKAGE:@//tools/build_rules/go/toolchain' (requested by nodes )
at com.google.devtools.build.skyframe.ParallelEvaluator$Evaluate.run(ParallelEvaluator.java:982)
at com.google.devtools.build.lib.concurrent.AbstractQueueVisitor$WrappedRunnable.run(AbstractQueueVisitor.java:499)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
Caused by: java.lang.IllegalArgumentException: Invalid BUILD file name for package '@//tools/build_rules/go/toolchain': /home/brian/bazel/tools/build_rules/go/toolchain/BUILD
at com.google.devtools.build.lib.packages.Package.finishInit(Package.java:299)
at com.google.devtools.build.lib.packages.Package$Builder.finishBuild(Package.java:1308)
at com.google.devtools.build.lib.skyframe.PackageFunction.compute(PackageFunction.java:501)
at com.google.devtools.build.skyframe.ParallelEvaluator$Evaluate.run(ParallelEvaluator.java:933)
... 4 more
Sponsor's comment: note the abundance of new Label.resolveRepositoryRelative() calls. They are ugly, but it's only making existing ugliness explicit. Yes, we should fix it, especially in the implementation of configurable attributes.
Refs #940
--
Change-Id: I8bd7f7b00bec58a7157507595421bc50c81b404c
Reviewed-on: https://bazel-review.googlesource.com/#/c/2591
MOS_MIGRATED_REVID=117429733
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 70d68212a0..c2b8333635 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -124,6 +124,7 @@ import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker; +import com.google.devtools.build.lib.testutil.BlazeTestUtils; import com.google.devtools.build.lib.testutil.FoundationTestCase; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; @@ -311,7 +312,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { packageCacheOptions.defaultVisibility, true, 7, ruleClassProvider.getDefaultsPackageContent(optionsParser), UUID.randomUUID()); - skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.deletedPackages)); + skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); } protected void setPackageCacheOptions(String... options) throws Exception { @@ -377,7 +378,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { view.setConfigurationsForTesting(masterConfig); view.setArtifactRoots( - ImmutableMap.of(PackageIdentifier.createInDefaultRepo(""), rootDirectory), masterConfig); + ImmutableMap.of(PackageIdentifier.createInMainRepo(""), rootDirectory), masterConfig); simulateLoadingPhase(); } @@ -567,8 +568,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { Collection<Label> targets, Collection<Label> labels, boolean keepGoing) throws InterruptedException, NoSuchTargetException, NoSuchPackageException { boolean success = visitor.sync(reporter, - ImmutableSet.copyOf(getTargets(targets)), - ImmutableSet.copyOf(labels), + getTargets(BlazeTestUtils.convertLabels(targets)), + ImmutableSet.copyOf(BlazeTestUtils.convertLabels(labels)), keepGoing, /*parallelThreads=*/4, /*maxDepth=*/Integer.MAX_VALUE); @@ -623,7 +624,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected ConfiguredTarget getConfiguredTarget(Label label, BuildConfiguration config) throws NoSuchPackageException, NoSuchTargetException, InterruptedException { ensureTargetsVisited(label); - return view.getConfiguredTargetForTesting(reporter, label, config); + return view.getConfiguredTargetForTesting( + reporter, BlazeTestUtils.convertLabel(label), config); } /** @@ -1468,7 +1470,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { reporter.removeHandler(failFastHandler); scratch.file("" + packageName + "/BUILD", lines); return getPackageManager() - .getPackage(reporter, PackageIdentifier.createInDefaultRepo(packageName)); + .getPackage(reporter, PackageIdentifier.createInMainRepo(packageName)); } /** |