diff options
author | Ulf Adams <ulfjack@google.com> | 2016-09-05 09:40:13 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-09-06 15:38:32 +0000 |
commit | ab64e592fe5f5fb2e5dd2996b72c75416b2de721 (patch) | |
tree | b75286653cfe812584ae30f133ef1364af2f452a /src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.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/analysis/DuplicateActionTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java index 90830c43da..655b86f674 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.analysis; import static org.junit.Assert.assertFalse; import com.google.devtools.build.lib.analysis.util.AnalysisTestCase; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -41,16 +40,4 @@ public class DuplicateActionTest extends AnalysisTestCase { assertFalse(hasErrors(getConfiguredTarget("//a:a"))); assertFalse(hasErrors(getConfiguredTarget("//a:b"))); } - - /** - * Same test with loading phase disabled. - */ - @RunWith(JUnit4.class) - public static class DuplicateActionTestWithoutLoading extends DuplicateActionTest { - - @Override - protected boolean isLoadingEnabled() { - return false; - } - } } |