From 4352dd23ba08357349df321a98bc2546d4094415 Mon Sep 17 00:00:00 2001 From: Janak Ramakrishnan Date: Tue, 14 Jun 2016 15:35:31 +0000 Subject: Remove ability of AbstractQueueVisitor to continue after an interrupt. That functionality was only used in tests. -- MOS_MIGRATED_REVID=124841573 --- .../build/lib/actions/ConcurrentMultimapWithHeadElementTest.java | 9 +++++++-- .../devtools/build/lib/actions/MapBasedActionGraphTest.java | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/actions') diff --git a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java index 832ee7242d..456b394a85 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java @@ -134,8 +134,13 @@ public class ConcurrentMultimapWithHeadElementTest { private final AtomicInteger actionCount = new AtomicInteger(0); private StressTester() { - super(/*concurrent=*/true, 200, 1, TimeUnit.SECONDS, - /*failFastOnException=*/true, /*failFastOnInterrupt=*/true, "action-graph-test"); + super( + /*concurrent=*/ true, + 200, + 1, + TimeUnit.SECONDS, + /*failFastOnException=*/ true, + "action-graph-test"); } private void addAndRemove(final Boolean key, final Integer add, final Integer remove) { diff --git a/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java b/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java index 2dd07ed868..a527549e6c 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java @@ -81,8 +81,13 @@ public class MapBasedActionGraphTest { private final AtomicInteger actionCount = new AtomicInteger(0); private ActionRegisterer() { - super(/*concurrent=*/true, 200, 1, TimeUnit.SECONDS, - /*failFastOnException=*/true, /*failFastOnInterrupt=*/true, "action-graph-test"); + super( + /*concurrent=*/ true, + 200, + 1, + TimeUnit.SECONDS, + /*failFastOnException=*/ true, + "action-graph-test"); FileSystem fileSystem = new InMemoryFileSystem(BlazeClock.instance()); Path path = fileSystem.getPath("/root/foo"); output = new Artifact(path, Root.asDerivedRoot(path)); -- cgit v1.2.3