compiletest: Remove the `-test` suffix from normalize directives #134759

Zalathar · 2024-12-25T11:32:13Z

This suffix was an artifact of using the same condition-checking engine as the ignore-* and only-* directives, but in practice we have only 2 tests that legitimately use a condition, and both of them only care about 32-bit vs 64-bit.

This PR detaches normalize-* directives from the condition checker, and replaces it with a much simpler system of four explicit NormalizeKind values. It then takes advantage of that simplicity to get rid of the -test suffix.

Addresses one of the points of #126372.

The new name-checking code is a bit quaint, but I think it's a definite improvement over the status quo.

The corresponding dev-guide update is rust-lang/rustc-dev-guide#2172.

r? jieyouxu

rustbot · 2024-12-25T11:32:24Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Zalathar · 2024-12-25T11:38:21Z

tests/ui/debuginfo/debuginfo-type-name-layout-ice-94961-1.rs

-//@ normalize-stderr-64bit: "18446744073709551615" -> "SIZE"
-//@ normalize-stderr-32bit: "4294967295" -> "SIZE"


Fun fact, this hasn't needed normalization since #106873.

Zalathar · 2024-12-25T11:47:48Z

Archaeological note: The two remaining tests that use conditional normalization are:

tests/ui/transmute/main.rs
tests/ui/consts/transmute-size-mismatch-before-typeck.rs

In both cases, there seems to have been a deliberate attempt to use pointer-size-dependent types, so for now I haven't disturbed them. It's possible that we could just restrict them to //@ only-64bit and remove conditional normalizations altogether, but I didn't want to have to justify that extra step in this PR.

…ieyouxu Add more `begin_panic` normalizations to panic backtrace tests Since rust-lang#123244, these tests have started failing locally on some systems (rust-lang#133997) due to minor variations in how `begin_panic` is printed in the backtrace. The variation appears to occur on macOS when `rust.debuginfo-level = "line-tables-only"` is set, which is the default in `config.compiler.toml`. It does not occur when the debuginfo level is set to 1. The variation doesn't seem relevant to these tests, so this PR simply adds another custom normalization rule to account for the variation. --- Will conflict with rust-lang#134759.

jieyouxu · 2024-12-26T11:58:35Z

This is going to take me a bit of time to review (scheduled for tmrw).

…ieyouxu Add more `begin_panic` normalizations to panic backtrace tests Since rust-lang#123244, these tests have started failing locally on some systems (rust-lang#133997) due to minor variations in how `begin_panic` is printed in the backtrace. The variation appears to occur on macOS when `rust.debuginfo-level = "line-tables-only"` is set, which is the default in `config.compiler.toml`. It does not occur when the debuginfo level is set to 1. The variation doesn't seem relevant to these tests, so this PR simply adds another custom normalization rule to account for the variation. --- Will conflict with rust-lang#134759.

Rollup merge of rust-lang#134781 - Zalathar:backtrace, r=SparrowLii,jieyouxu Add more `begin_panic` normalizations to panic backtrace tests Since rust-lang#123244, these tests have started failing locally on some systems (rust-lang#133997) due to minor variations in how `begin_panic` is printed in the backtrace. The variation appears to occur on macOS when `rust.debuginfo-level = "line-tables-only"` is set, which is the default in `config.compiler.toml`. It does not occur when the debuginfo level is set to 1. The variation doesn't seem relevant to these tests, so this PR simply adds another custom normalization rule to account for the variation. --- Will conflict with rust-lang#134759.

bors · 2024-12-27T00:38:23Z

☔ The latest upstream changes (presumably #134795) made this pull request unmergeable. Please resolve the merge conflicts.

Zalathar · 2024-12-27T01:53:02Z

Rebased due to conflicts with #134781 (which added some more normalize directives); no changes.

Zalathar · 2024-12-27T03:12:22Z

Added some FIXMEs for things I noticed but didn't clean up in this PR, since touching hundreds of tests is enough change for one PR (diff).

This is a little more verbose, but also more explicit, and avoids invoking the full condition engine when only the pointer-width conditions are used.

jieyouxu

Thanks!

I reviewed the test diffs manually.
The normalization rule is a bit wonky still, but that's pre-existing so.

jieyouxu · 2024-12-27T12:34:16Z

This modifies quite a lot of tests, so giving a higher p due to conflict-prone-ness

@bors r+ rollup p=1

bors · 2024-12-27T12:34:19Z

📌 Commit 835fbcb has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu · 2024-12-27T12:43:47Z

(It can be rolled up if someone is doing rollups)
(EDIT: like me)

Rollup of 8 pull requests Successful merges: - rust-lang#134606 (ptr::copy: fix docs for the overlapping case) - rust-lang#134622 (Windows: Use WriteFile to write to a UTF-8 console) - rust-lang#134759 (compiletest: Remove the `-test` suffix from normalize directives) - rust-lang#134787 (Spruce up the docs of several queries related to the type/trait system and const eval) - rust-lang#134806 (rustdoc: use shorter paths as preferred canonical paths) - rust-lang#134815 (Sort triples by name in platform_support.md) - rust-lang#134816 (tools: fix build failure caused by PR rust-lang#134420) - rust-lang#134819 (Fix mistake in windows file open) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-12-27T15:46:49Z

⌛ Testing commit 835fbcb with merge 6d3db55...

Rollup merge of rust-lang#134759 - Zalathar:normalize, r=jieyouxu compiletest: Remove the `-test` suffix from normalize directives This suffix was an artifact of using the same condition-checking engine as the `ignore-*` and `only-*` directives, but in practice we have only 2 tests that legitimately use a condition, and both of them only care about 32-bit vs 64-bit. This PR detaches `normalize-*` directives from the condition checker, and replaces it with a much simpler system of four explicit `NormalizeKind` values. It then takes advantage of that simplicity to get rid of the `-test` suffix. --- Addresses one of the points of rust-lang#126372. The new name-checking code is a bit quaint, but I think it's a definite improvement over the status quo. --- The corresponding dev-guide update is rust-lang/rustc-dev-guide#2172. r? jieyouxu

rustbot assigned jieyouxu Dec 25, 2024

Zalathar commented Dec 25, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Zalathar force-pushed the normalize branch from 1d5c4e9 to b1dfa73 Compare December 25, 2024 12:12

This comment has been minimized.

Sign in to view

Zalathar force-pushed the normalize branch from b1dfa73 to f9fe4fd Compare December 25, 2024 12:45

This was referenced Dec 25, 2024

Remove the -test suffix from normalize directives rust-lang/rustc-dev-guide#2172

Open

Add more begin_panic normalizations to panic backtrace tests #134781

Merged

Simplify or delete normalize directives that don't care about bit-width

d997bc9

Zalathar force-pushed the normalize branch from f9fe4fd to 9c350ee Compare December 27, 2024 01:52

Zalathar force-pushed the normalize branch from 9c350ee to 28788f2 Compare December 27, 2024 03:10

Zalathar added 2 commits December 27, 2024 19:58

Don't use parse_cfg_name_directive for normalize directives

5ba0dd4

This is a little more verbose, but also more explicit, and avoids invoking the full condition engine when only the pointer-width conditions are used.

Remove the -test suffix from normalize directives

835fbcb

Zalathar force-pushed the normalize branch from 28788f2 to 835fbcb Compare December 27, 2024 08:58

jieyouxu approved these changes Dec 27, 2024

View reviewed changes

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 Dec 27, 2024

jieyouxu mentioned this pull request Dec 27, 2024

Rollup of 8 pull requests #134822

Merged

bors merged commit bc3e891 into rust-lang:master Dec 27, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Dec 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

compiletest: Remove the `-test` suffix from normalize directives #134759

compiletest: Remove the `-test` suffix from normalize directives #134759

Zalathar commented Dec 25, 2024 •

edited

Loading

rustbot commented Dec 25, 2024

Zalathar Dec 25, 2024

This comment has been minimized.

Zalathar commented Dec 25, 2024

This comment has been minimized.

jieyouxu commented Dec 26, 2024

bors commented Dec 27, 2024

Zalathar commented Dec 27, 2024

Zalathar commented Dec 27, 2024

jieyouxu left a comment

jieyouxu commented Dec 27, 2024

bors commented Dec 27, 2024

jieyouxu commented Dec 27, 2024 •

edited

Loading

bors commented Dec 27, 2024

		//@ normalize-stderr-64bit: "18446744073709551615" -> "SIZE"
		//@ normalize-stderr-32bit: "4294967295" -> "SIZE"

compiletest: Remove the -test suffix from normalize directives #134759

compiletest: Remove the -test suffix from normalize directives #134759

Conversation

Zalathar commented Dec 25, 2024 • edited Loading

rustbot commented Dec 25, 2024

Zalathar Dec 25, 2024

Choose a reason for hiding this comment

This comment has been minimized.

Zalathar commented Dec 25, 2024

This comment has been minimized.

jieyouxu commented Dec 26, 2024

bors commented Dec 27, 2024

Zalathar commented Dec 27, 2024

Zalathar commented Dec 27, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu commented Dec 27, 2024

bors commented Dec 27, 2024

jieyouxu commented Dec 27, 2024 • edited Loading

bors commented Dec 27, 2024

compiletest: Remove the `-test` suffix from normalize directives #134759

compiletest: Remove the `-test` suffix from normalize directives #134759

Zalathar commented Dec 25, 2024 •

edited

Loading

jieyouxu commented Dec 27, 2024 •

edited

Loading