Fix aspect toolchains when used over output files.
This is a temporary fix, the underlying issue is still present and needs to be addressed, but this stops failing builds.
PiperOrigin-RevId: 447985361
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContext.java
index 18327b8..3f1a64c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContext.java
@@ -83,8 +83,11 @@
}
}
- // Verify that all mandatory toolchain type requirements are present.
ImmutableMap<ToolchainTypeInfo, ToolchainInfo> toolchains = toolchainsBuilder.buildOrThrow();
+
+ // Verify that all mandatory toolchain type requirements are present.
+ // TODO(b/232128775): Re-enable once aspect toolchain merging is fixed.
+ /*
for (ToolchainTypeRequirement toolchainTypeRequirement :
unloadedToolchainContext.toolchainTypes()) {
if (toolchainTypeRequirement.mandatory()) {
@@ -96,6 +99,7 @@
}
}
}
+ */
return new AutoValue_ResolvedToolchainContext(
// super:
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContextTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContextTest.java
index b8197d2..8fddca5 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ResolvedToolchainContextTest.java
@@ -30,6 +30,7 @@
import com.google.devtools.build.lib.skyframe.ToolchainException;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextImpl;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -88,7 +89,9 @@
.isEqualTo("baz");
}
+ // TODO(b/232128775): Re-enable once aspect toolchain merging is fixed.
@Test
+ @Ignore("b/232128775")
public void load_mandatory_missing() throws Exception {
ToolchainContextKey toolchainContextKey =
ToolchainContextKey.key()
diff --git a/src/test/shell/integration/toolchain_test.sh b/src/test/shell/integration/toolchain_test.sh
index 3e3c38d..bf19337 100755
--- a/src/test/shell/integration/toolchain_test.sh
+++ b/src/test/shell/integration/toolchain_test.sh
@@ -694,6 +694,43 @@
expect_log 'Using toolchain in aspect: rule message: "bar from demo", toolchain extra_str: "foo from test_toolchain"'
}
+function test_toolchain_use_in_aspect_with_output_file {
+ local -r pkg="${FUNCNAME[0]}"
+ write_test_toolchain "${pkg}"
+ write_test_aspect "${pkg}"
+ write_register_toolchain "${pkg}"
+
+ mkdir -p "${pkg}/demo"
+ cat > "${pkg}/demo/demo.bzl" <<EOF
+def _impl(ctx):
+ output = ctx.outputs.out
+ ctx.actions.write(output = output, content = ctx.attr.message)
+
+demo = rule(
+ implementation = _impl,
+ attrs = {
+ 'message': attr.string(),
+ 'out': attr.output(),
+ }
+)
+EOF
+ cat > "${pkg}/demo/BUILD" <<EOF
+load(':demo.bzl', 'demo')
+demo(
+ name = 'use',
+ message = 'bar from demo',
+ out = 'use.log',
+)
+EOF
+
+ # Also test aspects executing on an output file.
+ bazel build \
+ --aspects //${pkg}/toolchain:aspect_use_toolchain.bzl%use_toolchain \
+ "//${pkg}/demo:use.log" &> $TEST_log || fail "Build failed"
+ # TODO(b/232128775): Re-enable once aspect toolchain merging is fixed.
+ #expect_log 'Using toolchain in aspect: rule message: "bar from demo", toolchain extra_str: "foo from test_toolchain"'
+}
+
function test_toolchain_use_in_aspect_non_required_toolchain {
local -r pkg="${FUNCNAME[0]}"
write_test_toolchain "${pkg}"
