tests/run-make/print-cfg: add Android target_env case#155988
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom May 1, 2026
Merged
tests/run-make/print-cfg: add Android target_env case#155988rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
This comment has been minimized.
This comment has been minimized.
Android targets must not inherit `target_env="gnu"` from the Linux GNU base. Cover this in the existing print-cfg run-make test so a future target-spec refactor cannot silently re-introduce it.
40064e2 to
ef93fbb
Compare
Contributor
|
@bors r+ rollup |
Contributor
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 30, 2026
…env-print-cfg, r=petrochenkov tests/run-make/print-cfg: add Android target_env case Regression test for rust-lang#90834 rust-lang#77729 + rust-lang#78929 accidentally gave Android targets `target_env="gnu"` through `android_base` inheriting from `linux_gnu_base`. rust-lang#90834 moved it back to plain `linux_base` but didn't add a test, so a future target-spec refactor could bring it back unnoticed. This adds an Android case to `tests/run-make/print-cfg` covering exactly that. r? @petrochenkov
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 30, 2026
…uwer Rollup of 13 pull requests Successful merges: - #155249 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - #155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - #155919 (simplify `ast_fragments!`) - #155939 (Add feature gate for view_types experiment) - #155974 (add `c_variadic_experimental_arch` feature) - #155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases) - #156003 (Pass Session to optimize_and_codegen_fat_lto) - #153566 (Add suggestion for E0401 on inner const items) - #154610 (Suggest public re-exports when a private module makes an import path inaccessible) - #155523 (Reorganize `tests/ui/issues/` - 02) - #155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - #155987 (Make lifting infallible) - #155988 (tests/run-make/print-cfg: add Android target_env case)
rust-bors Bot
pushed a commit
that referenced
this pull request
May 1, 2026
Rollup of 19 pull requests Successful merges: - #155237 (Disentangle AST crates and error crates) - #155249 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - #155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - #155919 (simplify `ast_fragments!`) - #155939 (Add feature gate for view_types experiment) - #155954 (rustdoc: preserve parent doc cfg for `macro_export` macros) - #155974 (add `c_variadic_experimental_arch` feature) - #155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases) - #156003 (Pass Session to optimize_and_codegen_fat_lto) - #153566 (Add suggestion for E0401 on inner const items) - #154610 (Suggest public re-exports when a private module makes an import path inaccessible) - #155523 (Reorganize `tests/ui/issues/` - 02) - #155821 (c-variadic: document `Clone` and `Drop` instances and require `VaArgSafe: Copy`) - #155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - #155987 (Make lifting infallible) - #155988 (tests/run-make/print-cfg: add Android target_env case) - #156000 (Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=lld) - #156002 (Allow to use `Diagnostic` directly in `SharedContext::emit_lint`) - #156015 (rustc-dev-guide subtree update)
rust-timer
added a commit
that referenced
this pull request
May 1, 2026
Rollup merge of #155988 - Vastargazing:tests/android-target-env-print-cfg, r=petrochenkov tests/run-make/print-cfg: add Android target_env case Regression test for #90834 #77729 + #78929 accidentally gave Android targets `target_env="gnu"` through `android_base` inheriting from `linux_gnu_base`. #90834 moved it back to plain `linux_base` but didn't add a test, so a future target-spec refactor could bring it back unnoticed. This adds an Android case to `tests/run-make/print-cfg` covering exactly that. r? @petrochenkov
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Regression test for #90834
#77729 + #78929 accidentally gave Android targets
target_env="gnu"through
android_baseinheriting fromlinux_gnu_base. #90834 moved itback to plain
linux_basebut didn't add a test, so a future target-specrefactor could bring it back unnoticed. This adds an Android case to
tests/run-make/print-cfgcovering exactly that.r? @petrochenkov