Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 21, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Zalathar and others added 8 commits October 21, 2025 12:39
There are a few tests that were trying to skip i586 targets via the `TARGET`
environment variable instead, so better to just add support for the directive.
If something like this is needed again in the future, please set environment
variables for the build and run subprocesses, instead of setting them on the
compiletest process.
Now that all directive names are checked against a list of known-good names,
these ad-hoc checks can never fire.
compiletest: Don't set `TARGET` for non run-make tests

There are a few tests that were using `TARGET` to quietly do nothing on `i586` targets, but it's cleaner to just add support for `//@ ignore-i586` instead.

This lets us get rid of an unsafe `env::set_var` in compiletest, which really should have been setting the environment variable on individual build/run subprocess commands anyway.

- The original code and tests were introduced way back in rust-lang#39068
motor: Add new `set_times` stubs

Motor OS `std` support (rust-lang#147000) and `set_times`/`set_times_nofollow` (rust-lang#147468) were merged around the same time, so Motor OS is missing this API and currently fails to build.

cc `@lasiotus`
compiletest: More directive handling tweaks

- Follow-up to rust-lang#147903.

---

These are some more preparatory changes that were extracted from a larger overhaul of directive handling that I'm still working on.

---

The revision check was introduced by rust-lang#61778, and later modified by rust-lang#113603. It doesn't appear to be doing anything particularly load-bearing (since a bogus mode seems to cause a panic later anyway), and getting rid of it avoids the need to pass the current test revision to directive-handling code.

- rust-lang#61778
- rust-lang#113603

r? jieyouxu
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 21, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 21, 2025

📌 Commit 8baad70 has been approved by matthiaskrgr

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 Oct 21, 2025
@bors
Copy link
Collaborator

bors commented Oct 21, 2025

⌛ Testing commit 8baad70 with merge 695857b...

@bors
Copy link
Collaborator

bors commented Oct 21, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 695857b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2025
@bors bors merged commit 695857b into rust-lang:master Oct 21, 2025
12 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 21, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#147929 compiletest: Don't set TARGET for non run-make tests f35d90dc12555d4af9f7bb6df89943087e07518e (link)
#147930 motor: Add new set_times stubs 2cbd2e3e74fb489c78e43e7c9e2c849e11619dcf (link)
#147934 compiletest: More directive handling tweaks 2ab40d3227335b212377cd61a0f9d737b969bff4 (link)

previous master: 869fb4679f

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 869fb46 (parent) -> 695857b (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 695857bc3f72ec4f59c79f323460fe488c38a53f --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-android: 1204.0s -> 1611.0s (33.8%)
  2. dist-x86_64-windows-gnullvm: 5016.2s -> 5995.1s (19.5%)
  3. pr-check-1: 1777.9s -> 1480.4s (-16.7%)
  4. aarch64-apple: 11246.1s -> 9526.3s (-15.3%)
  5. dist-ohos-x86_64: 4764.9s -> 4182.1s (-12.2%)
  6. dist-loongarch64-musl: 5161.0s -> 5744.1s (11.3%)
  7. dist-ohos-armv7: 4085.2s -> 4531.6s (10.9%)
  8. i686-gnu-2: 6181.6s -> 5514.6s (-10.8%)
  9. aarch64-gnu-debug: 4267.1s -> 3845.0s (-9.9%)
  10. dist-ohos-aarch64: 4468.7s -> 4044.6s (-9.5%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (695857b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (primary -2.1%, secondary 2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
5.1% [2.9%, 7.4%] 2
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
-3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) -2.1% [-2.1%, -2.1%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 474.127s -> 472.072s (-0.43%)
Artifact size: 388.68 MiB -> 388.64 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants