diff options
author | 2016-09-05 09:40:13 +0000 | |
---|---|---|
committer | 2016-09-06 15:38:32 +0000 | |
commit | ab64e592fe5f5fb2e5dd2996b72c75416b2de721 (patch) | |
tree | b75286653cfe812584ae30f133ef1364af2f452a /src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java | |
parent | ca4e573188e6466f31e2208f659734cf6428c811 (diff) |
Make --experimental_interleave_loading_and_analysis a no-op.
This is now enabled by default, and this change removes the code path where
it's disabled.
Remove a few tests that were testing the removed code, and rewrite some others
that still seem useful. We still drop configured targets on configuration
changes, so we use that to check that things are dropped from Skyframe.
--
MOS_MIGRATED_REVID=132226208
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java b/src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java index 34fb706b09..f0a81f15e6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/util/SkyframeExecutorTestUtils.java @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue; import com.google.devtools.build.lib.skyframe.PackageValue; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; -import com.google.devtools.build.lib.skyframe.TargetMarkerValue; import com.google.devtools.build.skyframe.ErrorInfo; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.MemoizingEvaluator; @@ -166,9 +165,9 @@ public class SkyframeExecutorTestUtils { * <p>This helper is provided so legacy tests don't need to know about details of skyframe keys. */ @Nullable - public static ErrorInfo getExistingFailedTarget(SkyframeExecutor skyframeExecutor, Label label) + public static ErrorInfo getExistingFailedPackage(SkyframeExecutor skyframeExecutor, Label label) throws InterruptedException { - SkyKey key = TargetMarkerValue.key(label); + SkyKey key = PackageValue.key(label.getPackageIdentifier()); return getExistingError(skyframeExecutor, key); } } |