diff options
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java | 13 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java | 31 |
2 files changed, 36 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index 9b1b4dc214..9cf3254d92 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java @@ -231,6 +231,19 @@ public class LoadingPhaseRunnerTest { } @Test + public void testTestFilteringIncludingManual() throws Exception { + writeBuildFilesForTestFiltering(); + tester.useLoadingOptions("--build_manual_tests"); + LoadingResult loadingResult = assertNoErrors(tester.loadTests("//tests:all")); + assertThat(loadingResult.getTargets()) + .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2", "//tests:t3")); + assertThat(loadingResult.getTestsToRun()) + .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2")); + assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets()); + assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets()); + } + + @Test public void testTestFilteringBuildTestsOnly() throws Exception { writeBuildFilesForTestFiltering(); tester.useLoadingOptions("--build_tests_only"); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java index 3ac4ac9f31..a56466c01d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java @@ -51,32 +51,47 @@ public class TargetPatternPhaseKeyTest { .addEqualityGroup(of(ImmutableList.of("c"), "")) .addEqualityGroup(of(ImmutableList.<String>of(), "")) .addEqualityGroup(of( - ImmutableList.<String>of(), "", ImmutableList.<String>of(), null, + ImmutableList.<String>of(), "", ImmutableList.<String>of(), false, null, COMPILE_ONE_DEPENDENCY)) .addEqualityGroup(of( - ImmutableList.<String>of(), "", ImmutableList.<String>of(), emptyTestFilter(), + ImmutableList.<String>of(), "", ImmutableList.<String>of(), true, null, + COMPILE_ONE_DEPENDENCY)) + .addEqualityGroup(of( + ImmutableList.<String>of(), "", ImmutableList.<String>of(), false, + emptyTestFilter(), + BUILD_TESTS_ONLY)) + .addEqualityGroup(of( + ImmutableList.<String>of(), "", ImmutableList.<String>of(), true, + emptyTestFilter(), BUILD_TESTS_ONLY)) .addEqualityGroup(of( - ImmutableList.<String>of(), "", ImmutableList.<String>of(), emptyTestFilter(), + ImmutableList.<String>of(), "", ImmutableList.<String>of(), false, + emptyTestFilter(), DETERMINE_TESTS)) - .addEqualityGroup(of( - ImmutableList.<String>of(), "", ImmutableList.<String>of("a"), null)) + .addEqualityGroup(of( + ImmutableList.<String>of(), "", ImmutableList.<String>of(), true, + emptyTestFilter(), + DETERMINE_TESTS)) + .addEqualityGroup(of( + ImmutableList.<String>of(), "", ImmutableList.<String>of("a"), false, null)) + .addEqualityGroup(of( + ImmutableList.<String>of(), "", ImmutableList.<String>of("a"), true, null)) .testEquals(); } private TargetPatternList of(ImmutableList<String> targetPatterns, String offset, ImmutableList<String> buildTagFilter, - @Nullable TestFilter testFilter, Flag... flags) { + boolean includeManualTests, @Nullable TestFilter testFilter, Flag... flags) { ImmutableSet<Flag> set = ImmutableSet.copyOf(flags); boolean compileOneDependency = set.contains(Flag.COMPILE_ONE_DEPENDENCY); boolean buildTestsOnly = set.contains(Flag.BUILD_TESTS_ONLY); boolean determineTests = set.contains(Flag.DETERMINE_TESTS); return new TargetPatternList(targetPatterns, offset, compileOneDependency, buildTestsOnly, - determineTests, buildTagFilter, testFilter); + determineTests, buildTagFilter, includeManualTests, testFilter); } private TargetPatternList of(ImmutableList<String> targetPatterns, String offset) { - return of(targetPatterns, offset, ImmutableList.<String>of(), null); + return of(targetPatterns, offset, ImmutableList.<String>of(), false, null); } private TestFilter emptyTestFilter() { |