Skip to content

Conversation

folkertdev
Copy link
Contributor

@folkertdev folkertdev commented Jun 12, 2025

In particular, anything that includes none in the target triple, and nvptx64-nvidia-cuda. Right now we don't cross-compile the run-make tests, but we want to in the future.

This uses //@ needs-target-std introduced in #142297.

Useful for #139244 and #141856.

The modified files are based on running #141856 locally. It might be that #139244 uncovers some additional files, but that PR needs to be rebased (though actually I'd advice to rebase the non-test changes onto this PR, probably faster that way).

r? @jieyouxu

vim notes for future me

Make a file with lines like this

/home/folkertdev/rust/rust/tests/run-make/export/disambiguator/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/invalid-so/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/no-builtins-attribute/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/export/extern-opt/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/link-dedup/rmake.rs:1:1

then

:set errorformat=%f:%l:%c
:cfile /tmp/files-to-fix.txt
:copen
:cnext
:cprev

are your friends

In particular, anything that includes `none` in the target tripple, and `nvptx64-nvidia-cuda`
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 12, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 12, 2025

This PR modifies run-make tests.

cc @jieyouxu

@jieyouxu
Copy link
Member

@bors2 try jobs=test-various,armhf-gnu

@rust-bors
Copy link

rust-bors bot commented Jun 12, 2025

⌛ Trying commit efaf3eb with merge eae7d15

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 12, 2025
ignore `run-make` tests that need `std` on targets without `std`

In particular, anything that includes `none` in the target triple, and `nvptx64-nvidia-cuda`. Right now we don't cross-compile the `run-make` tests, but we want to in the future.

This uses `//@ needs-target-std` introduced in #142297.

Useful for #139244 and #141856.

The modified files are based on running #141856 locally. It might be that #139244 uncovers some additional files, but that PR needs to be rebased (though actually I'd advice to rebase the non-test changes onto this PR, probably faster that way).

r? `@jieyouxu`

<details>
  <summary>vim notes for future me</summary>

Make a file with lines like this

```
/home/folkertdev/rust/rust/tests/run-make/export/disambiguator/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/invalid-so/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/no-builtins-attribute/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/export/extern-opt/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/link-dedup/rmake.rs:1:1
```

then

```
:set errorformat=%f:%l:%c
:cfile /tmp/files-to-fix.txt
```
```
:copen
:cnext
:cprev
```

are your friends

</details>

try-job: test-various
try-job: armhf-gnu
@jieyouxu
Copy link
Member

Also in case you need to run try jobs:

@bors2 delegate=try

@rust-bors
Copy link

rust-bors bot commented Jun 12, 2025

@folkertdev can now perform try builds on this pull request

@rust-bors
Copy link

rust-bors bot commented Jun 13, 2025

☀️ Try build successful (CI)
Build commit: eae7d15 (eae7d15db7c38d3a8c8bc38741ad7652556a5e70, parent: 6c8138de8f1c96b2f66adbbc0e37c73525444750)

@folkertdev
Copy link
Contributor Author

This PR only ignore tests, so it makes sense that the try job would succeed.

Also as background for others: these tests currently run for the host, not the stated target. So, we're not losing test coverage here, these tests never ran for the stated target (because they can't). I also don't think it's worth it to make these tests no_std, the behavior they test is not really target-specific, and covered by the other test runs.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for helping me with this! 🩵

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 16, 2025

📌 Commit efaf3eb has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 16, 2025
tgross35 added a commit to tgross35/rust that referenced this pull request Jun 16, 2025
…ieyouxu

ignore `run-make` tests that need `std` on targets without `std`

In particular, anything that includes `none` in the target triple, and `nvptx64-nvidia-cuda`. Right now we don't cross-compile the `run-make` tests, but we want to in the future.

This uses `//@ needs-target-std` introduced in rust-lang#142297.

Useful for rust-lang#139244 and rust-lang#141856.

The modified files are based on running rust-lang#141856 locally. It might be that rust-lang#139244 uncovers some additional files, but that PR needs to be rebased (though actually I'd advice to rebase the non-test changes onto this PR, probably faster that way).

r? `@jieyouxu`

<details>
  <summary>vim notes for future me</summary>

Make a file with lines like this

```
/home/folkertdev/rust/rust/tests/run-make/export/disambiguator/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/invalid-so/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/no-builtins-attribute/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/export/extern-opt/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/link-dedup/rmake.rs:1:1
```

then

```
:set errorformat=%f:%l:%c
:cfile /tmp/files-to-fix.txt
```
```
:copen
:cnext
:cprev
```

are your friends

</details>
rust-bors bot added a commit that referenced this pull request Jun 16, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
bors added a commit that referenced this pull request Jun 16, 2025
Rollup of 8 pull requests

Successful merges:

 - #140809 (Reduce special casing for the panic runtime)
 - #142082 (Refactor `rustc_attr_data_structures` documentation)
 - #142125 (Stabilize "file_lock" feature)
 - #142373 (Fix Debug for Location)
 - #142414 (ignore `run-make` tests that need `std` on targets without `std`)
 - #142416 (Assorted bootstrap cleanups (step 2))
 - #142431 (Add initial version of snapshot tests to bootstrap)
 - #142528 (clarify `rustc_do_not_const_check` comment)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-bors bot added a commit that referenced this pull request Jun 16, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
rust-bors bot added a commit that referenced this pull request Jun 16, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
rust-bors bot added a commit that referenced this pull request Jun 16, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
bors added a commit that referenced this pull request Jun 16, 2025
Rollup of 8 pull requests

Successful merges:

 - #139340 (Fix RISC-V C function ABI when passing/returning structs containing floats)
 - #142341 (Don't suggest converting `///` to `//` when expecting `,`)
 - #142414 (ignore `run-make` tests that need `std` on targets without `std`)
 - #142498 (Port `#[rustc_as_ptr]` to the new attribute system)
 - #142554 (Fix `PathSource` lifetimes.)
 - #142562 (Update the `backtrace` submodule)
 - #142565 (Test naked asm for wasm32-unknown-unknown)
 - #142573 (`fn candidate_is_applicable` to method)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e83ca06 into rust-lang:master Jun 16, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 16, 2025
rust-timer added a commit that referenced this pull request Jun 16, 2025
Rollup merge of #142414 - folkertdev:ignore-nostd-tests, r=jieyouxu

ignore `run-make` tests that need `std` on targets without `std`

In particular, anything that includes `none` in the target triple, and `nvptx64-nvidia-cuda`. Right now we don't cross-compile the `run-make` tests, but we want to in the future.

This uses `//@ needs-target-std` introduced in #142297.

Useful for #139244 and #141856.

The modified files are based on running #141856 locally. It might be that #139244 uncovers some additional files, but that PR needs to be rebased (though actually I'd advice to rebase the non-test changes onto this PR, probably faster that way).

r? ``@jieyouxu``

<details>
  <summary>vim notes for future me</summary>

Make a file with lines like this

```
/home/folkertdev/rust/rust/tests/run-make/export/disambiguator/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/invalid-so/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/no-builtins-attribute/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/export/extern-opt/rmake.rs:1:1
/home/folkertdev/rust/rust/tests/run-make/link-dedup/rmake.rs:1:1
```

then

```
:set errorformat=%f:%l:%c
:cfile /tmp/files-to-fix.txt
```
```
:copen
:cnext
:cprev
```

are your friends

</details>
rust-bors bot added a commit that referenced this pull request Jun 16, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
[WIP] Enable automatic cross-compilation in run-make tests

> [!CAUTION]
>
> Stacked on top of #142414, needs rebase.

Supersedes #138066.

Blocker for #141856.

Based on #138066 with #139242 + #139239 cherry-picked in, plus `rustdoc()` cross-compile changes.

r? `@ghost`

try-job: armhf-gnu
try-job: test-various
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants