diff options
| author |  gregce <gregce@google.com> | 2017-07-22 00:11:13 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 09:51:17 +0200 |
| commit | 45ae096f3897e164a28a0cb1da9e20c9f523fc9c (patch) | |
| tree | 0c0f2836738f67f2b34825fdc2b800e66e9438c9 /src/test/java/com | |
| parent | 129c93051e1c1aeb5df8991d8e4de6607f315130 (diff) | |
Skip tests that aren't CPU-compatible with the current build.
We don't yet have a SKIPPED test status. So for now we report
"NO STATUS".
Also moved top-level constraint checking to its own file,
since its logic is getting more complicated.
PiperOrigin-RevId: 162790879
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java index 940c8946cb..c6ac94a0db 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java @@ -378,6 +378,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, null, null, + null, executor, null, false, @@ -406,6 +407,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, null, null, + null, executor, null, false, @@ -781,6 +783,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, null, null, + null, executor, null, false, diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 64ee5df3e2..0357d70877 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -236,7 +236,8 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { Set<Artifact> artifacts, Set<ConfiguredTarget> parallelTests, Set<ConfiguredTarget> exclusiveTests, - Collection<ConfiguredTarget> targetsToBuild, + Set<ConfiguredTarget> targetsToBuild, + Set<ConfiguredTarget> targetsToSkip, Collection<AspectValue> aspects, Executor executor, Set<ConfiguredTarget> builtTargets, @@ -384,6 +385,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { null, null, null, + null, executor, builtArtifacts, /*explain=*/ false, |