Skip to content

Commit

Permalink
Internal change
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 586985384
Change-Id: I276cfc8210f35ee000414ce69577958b8f98a938
  • Loading branch information
comius authored and copybara-github committed Dec 1, 2023
1 parent 5af646c commit 68362d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/test/shell/integration/target_compatible_with_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ EOF
--show_result=10 \
--host_platform=@//target_skipping:foo2_bar1_platform \
--platforms=@//target_skipping:foo2_bar1_platform \
--extra_execution_platforms= \
//target_skipping:generated_test.cc &> "${TEST_log}" && fail "Bazel passed unexpectedly."
expect_log "ERROR:.* Target //target_skipping:generated_test.cc is incompatible and cannot be built, but was explicitly requested"

Expand All @@ -787,6 +788,7 @@ EOF
--show_result=10 \
--host_platform=@//target_skipping:foo2_bar1_platform \
--platforms=@//target_skipping:foo2_bar1_platform \
--extra_execution_platforms= \
//target_skipping:generated_test &> "${TEST_log}" && fail "Bazel passed unexpectedly."
expect_log 'ERROR:.* Target //target_skipping:generated_test is incompatible and cannot be built, but was explicitly requested'

Expand Down Expand Up @@ -835,6 +837,7 @@ EOF
--show_result=10 \
--host_platform=@//target_skipping:foo2_bar1_platform \
--platforms=@//target_skipping:foo2_bar1_platform \
--extra_execution_platforms= \
//target_skipping:generated_test &> "${TEST_log}" && fail "Bazel passed unexpectedly."
expect_log 'ERROR:.* Target //target_skipping:generated_test is incompatible and cannot be built, but was explicitly requested'

Expand Down Expand Up @@ -1254,6 +1257,7 @@ EOF
# violated.
bazel build --host_platform=@//target_skipping:foo1_bar2_platform \
--platforms=@//target_skipping:foo2_bar1_platform \
--extra_execution_platforms= \
//target_skipping:host_tool_message.txt &> "${TEST_log}" \
|| fail "Bazel failed unexpectedly."
expect_log " ${PRODUCT_NAME}-bin/target_skipping/host_tool_message.txt$"
Expand Down
1 change: 1 addition & 0 deletions src/test/shell/integration/toolchain_transition_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ EOF
bazel build \
--platforms="//${pkg}/platform:target" \
--host_platform="//${pkg}/platform:host" \
--extra_execution_platforms= \
"//${pkg}:sample" &> $TEST_log || fail "Build failed"

# Verify contents of sample.log.
Expand Down

0 comments on commit 68362d0

Please sign in to comment.