Skip to content

Conversation

@Enselic
Copy link
Member

@Enselic Enselic commented Oct 17, 2025

So that when we later add support for revisions we can use the same syntax for revisions as elsewhere (for #147426).

This also prevents people from making typos for commands since src/tools/compiletest/src/directives/directive_names.rs will catch such typos now.

Note that we add one FIXME for a non-trivial change for later:

// FIXME(#148097): Change `// cdb-checksimple_closure` to `//@ cdb-check:simple_closure`

TODO

Zulip discussion

https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/.2F.2F.40.20syntax.20for.20debuginfo.20tests/with/545015582

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. labels Oct 17, 2025
@rust-log-analyzer

This comment has been minimized.

Zalathar added a commit to Zalathar/rust that referenced this pull request Oct 26, 2025
…lathar

tests/debuginfo/closures.rs: Activate misspelled `cdb-check`

Split out from rust-lang#147799 because these seemingly simple corrections can turn out to be non-trivial. See rust-lang#147728 for example.
Zalathar added a commit to Zalathar/rust that referenced this pull request Oct 26, 2025
…lathar

tests/debuginfo/closures.rs: Activate misspelled `cdb-check`

Split out from rust-lang#147799 because these seemingly simple corrections can turn out to be non-trivial. See rust-lang#147728 for example.
bors added a commit that referenced this pull request Oct 26, 2025
tests/debuginfo/closures.rs: Activate misspelled `cdb-check`

Split out from #147799 because these seemingly simple corrections can turn out to be non-trivial. See #147728 for example.
@Enselic Enselic force-pushed the slash-slash-at-debuginfo-tests branch 2 times, most recently from 74887a7 to 1f5cd0c Compare October 31, 2025 16:37
@Enselic Enselic changed the title tests: Use //@ prefixes also for debuginfo test directives compiletest: Use //@ prefixes also for debuginfo test directives Oct 31, 2025
@rust-log-analyzer

This comment has been minimized.

@Enselic Enselic force-pushed the slash-slash-at-debuginfo-tests branch from 1f5cd0c to 9ec7434 Compare October 31, 2025 18:10
@Enselic
Copy link
Member Author

Enselic commented Oct 31, 2025

@bors try jobs=x86_64-msvc-1

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Oct 31, 2025
compiletest: Use `//@` prefixes also for debuginfo test directives

try-job: x86_64-msvc-1
@rust-bors
Copy link

rust-bors bot commented Oct 31, 2025

☀️ Try build successful (CI)
Build commit: c89eb6c (c89eb6c72bc4a168b32b17a36f56df1e617c3cb3, parent: 51f5892019f8fb07864647d46c4eb577d3b0719f)

@Enselic Enselic force-pushed the slash-slash-at-debuginfo-tests branch from 9ec7434 to 19de8a2 Compare November 1, 2025 08:30
@Enselic
Copy link
Member Author

Enselic commented Nov 1, 2025

@bors try jobs=x86_64-msvc-1

rust-bors bot added a commit that referenced this pull request Nov 1, 2025
compiletest: Use `//@` prefixes also for debuginfo test directives

try-job: x86_64-msvc-1
@rust-bors

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Nov 1, 2025

☀️ Try build successful (CI)
Build commit: 464c055 (464c055969e217e038285dbdafe6bcb4c174f8a0, parent: 17e7324d44c7b310b776302880fdd08d9252118a)

@Enselic
Copy link
Member Author

Enselic commented Nov 1, 2025

x86_64-msvc-1 does not have cdb it seems, but I think aarch64 does:

@bors try jobs=aarch64-msvc-1

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Nov 1, 2025
compiletest: Use `//@` prefixes also for debuginfo test directives

try-job: aarch64-msvc-1
@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Nov 1, 2025

💔 Test for 8aa08e9 failed: CI. Failed jobs:

@rustbot
Copy link
Collaborator

rustbot commented Nov 25, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Enselic
Copy link
Member Author

Enselic commented Nov 25, 2025

#147760 is now merged, with what looks like an impressive number of conflicts.

Luckily they were easy to resolve mechanically.

@saethlin
Copy link
Member

r? saethlin

@bors r+ rollup=never p=6 This will conflict with any change to the debuginfo tests

@bors
Copy link
Collaborator

bors commented Nov 25, 2025

📌 Commit 5b57d02 has been approved by saethlin

It is now in the queue for this repository.

@rustbot rustbot assigned saethlin and unassigned wesleywiser Nov 25, 2025
@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 Nov 25, 2025
bors added a commit that referenced this pull request Nov 26, 2025
…thlin

compiletest: Use `//@` prefixes also for debuginfo test directives

So that when we later add support for revisions we can use the same syntax for revisions as elsewhere (for #147426).

This also prevents people from making typos for commands since `src/tools/compiletest/src/directives/directive_names.rs` will catch such typos now.

Note that we add one FIXME for a non-trivial change for later:
```
// FIXME(#148097): Change `// cdb-checksimple_closure` to `//@ cdb-check:simple_closure`
```

### TODO
- [x] Triple-check that all tests still run and all directives are still applied. Done: #147799 (comment)

### Zulip discussion

https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/.2F.2F.40.20syntax.20for.20debuginfo.20tests/with/545015582
@bors
Copy link
Collaborator

bors commented Nov 26, 2025

⌛ Testing commit 5b57d02 with merge b249b3d...

@bors
Copy link
Collaborator

bors commented Nov 26, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 26, 2025
@Zalathar
Copy link
Member

I can't see raw logs, which means a runner probably flaked out.

@bors retry

@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 Nov 26, 2025
@bors
Copy link
Collaborator

bors commented Nov 26, 2025

⌛ Testing commit 5b57d02 with merge 6840234...

@bors
Copy link
Collaborator

bors commented Nov 26, 2025

☀️ Test successful - checks-actions
Approved by: saethlin
Pushing 6840234 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 26, 2025
@bors bors merged commit 6840234 into rust-lang:main Nov 26, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 26, 2025
@github-actions
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 d8a7534 (parent) -> 6840234 (this PR)

Test differences

Show 3 test diffs

3 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 6840234806e4a57e14112a1137783c885b7a23db --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-apple-various: 4310.5s -> 3326.1s (-22.8%)
  2. dist-loongarch64-linux: 5296.8s -> 6414.3s (+21.1%)
  3. tidy: 192.3s -> 159.5s (-17.1%)
  4. x86_64-gnu-debug: 6622.1s -> 5999.4s (-9.4%)
  5. aarch64-apple: 8545.1s -> 7748.8s (-9.3%)
  6. x86_64-gnu-gcc: 3136.0s -> 2862.9s (-8.7%)
  7. arm-android: 6151.6s -> 5631.7s (-8.5%)
  8. i686-msvc-1: 10914.4s -> 10018.6s (-8.2%)
  9. x86_64-msvc-ext3: 6490.5s -> 5971.9s (-8.0%)
  10. dist-various-2: 2106.5s -> 2261.6s (+7.4%)
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 (6840234): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

Results (primary -3.6%, secondary -4.0%)

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)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
-3.6% [-10.9%, -1.8%] 15
Improvements ✅
(secondary)
-5.2% [-9.0%, -2.1%] 6
All ❌✅ (primary) -3.6% [-10.9%, -1.8%] 15

Binary size

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

Bootstrap: 479.37s -> 469.478s (-2.06%)
Artifact size: 386.91 MiB -> 386.94 MiB (0.01%)

github-actions bot pushed a commit to rust-lang/compiler-builtins that referenced this pull request Nov 27, 2025
…thlin

compiletest: Use `//@` prefixes also for debuginfo test directives

So that when we later add support for revisions we can use the same syntax for revisions as elsewhere (for rust-lang/rust#147426).

This also prevents people from making typos for commands since `src/tools/compiletest/src/directives/directive_names.rs` will catch such typos now.

Note that we add one FIXME for a non-trivial change for later:
```
// FIXME(#148097): Change `// cdb-checksimple_closure` to `//@ cdb-check:simple_closure`
```

### TODO
- [x] Triple-check that all tests still run and all directives are still applied. Done: rust-lang/rust#147799 (comment)

### Zulip discussion

https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/.2F.2F.40.20syntax.20for.20debuginfo.20tests/with/545015582
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 A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants