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
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index ef87660..953ae16 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -430,6 +430,7 @@
analysisResult.getParallelTests(),
analysisResult.getExclusiveTests(),
analysisResult.getTargetsToBuild(),
+ analysisResult.getTargetsToSkip(),
analysisResult.getAspects(),
executor,
builtTargets,
@@ -467,9 +468,10 @@
try (AutoProfiler p = AutoProfiler.profiled("Show results", ProfilerTask.INFO)) {
buildResult.setSuccessfulTargets(
determineSuccessfulTargets(configuredTargets, builtTargets, timer));
+ buildResult.setSkippedTargets(analysisResult.getTargetsToSkip());
BuildResultPrinter buildResultPrinter = new BuildResultPrinter(env);
- buildResultPrinter.showBuildResult(
- request, buildResult, configuredTargets, analysisResult.getAspects());
+ buildResultPrinter.showBuildResult(request, buildResult, configuredTargets,
+ analysisResult.getTargetsToSkip(), analysisResult.getAspects());
}
try (AutoProfiler p = AutoProfiler.profiled("Show artifacts", ProfilerTask.INFO)) {