From 45ae096f3897e164a28a0cb1da9e20c9f523fc9c Mon Sep 17 00:00:00 2001
From: gregce <gregce@google.com>
Date: Sat, 22 Jul 2017 00:11:13 +0200
Subject: 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
---
 .../google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java   | 3 +++
 .../google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/test/java/com')

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,
-- 
cgit v1.2.3