aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
diff options
context:
space:
mode:
authorGravatar Janak Ramakrishnan <janakr@google.com>2016-05-13 21:14:56 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-05-16 15:16:42 +0000
commit3b5d5d22f27fa8d9297fdf39b5b18d1bb6ea8e57 (patch)
treee0503976694a62a8365403abc888f33c76fb8e3a /src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
parenta56c1f4a1b47131b6d366a658f1f1e5abe0cdf3d (diff)
Stop converting temporary direct deps to a set. In almost all cases, this conversion is unnecessary and wasteful. In the remaining cases, the set conversion can be explicit.
-- MOS_MIGRATED_REVID=122294939
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
index 8ca696e9e7..c18f07666d 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -1047,9 +1047,8 @@ public class MemoizingEvaluatorTest {
@Test
public void cycleAndSelfEdgeWithDirtyValueInSameGroup() throws Exception {
- makeGraphDeterministic();
- final SkyKey cycleKey1 = GraphTester.toSkyKey("zcycleKey1");
- final SkyKey cycleKey2 = GraphTester.toSkyKey("acycleKey2");
+ final SkyKey cycleKey1 = GraphTester.toSkyKey("cycleKey1");
+ final SkyKey cycleKey2 = GraphTester.toSkyKey("cycleKey2");
tester.getOrCreate(cycleKey2).addDependency(cycleKey2).setComputedValue(CONCATENATE);
tester
.getOrCreate(cycleKey1)
@@ -1059,8 +1058,9 @@ public class MemoizingEvaluatorTest {
@Override
public SkyValue compute(SkyKey skyKey, Environment env)
throws SkyFunctionException, InterruptedException {
+ // The order here is important -- 2 before 1.
Map<SkyKey, SkyValue> result =
- env.getValues(ImmutableList.of(cycleKey1, cycleKey2));
+ env.getValues(ImmutableList.of(cycleKey2, cycleKey1));
Preconditions.checkState(env.valuesMissing(), result);
return null;
}