From ab64e592fe5f5fb2e5dd2996b72c75416b2de721 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Mon, 5 Sep 2016 09:40:13 +0000 Subject: 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 --- .../devtools/build/lib/analysis/DuplicateActionTest.java | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java') 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; - } - } } -- cgit v1.2.3