Bump ui test to 0.26 #3866

oli-obk · 2024-09-07T16:29:03Z

lots of issues fixed and various improvements

🤞 that it works this time around

tests/pass/shims/x86/intrinsics-x86-adx.rs

tests/ui.rs

RalfJung · 2024-09-08T09:00:42Z

No AFAIK we have no CI test for "run --dep"... We should, though.

tests/ui.rs

oli-obk · 2024-09-08T13:35:14Z

uh... can someone bless the native lib tests? I don't have a linux machine

eduardosm · 2024-09-08T13:41:17Z

There you go: miri-bless.diff.zip

RalfJung · 2024-09-08T13:53:16Z

macOS should also work for the native lib tests.

oli-obk · 2024-09-08T20:26:40Z

There you go: miri-bless.diff.zip

Thanks!

macOS should also work for the native lib tests.

I don't have a unix machine and don't want to figure out wsl 😆

RalfJung · 2024-09-08T21:00:01Z

Ah, so I can ask you to test the bat file and other Windows things then when that comes up? ;)

oli-obk · 2024-09-08T21:19:59Z

Yea, they work great modulo bat files having a prompt when cancelled with Ctrl + C

oli-obk · 2024-09-08T21:22:01Z

Oh fun. Line ending failures I think

ci/ci.sh

tests/fail-dep/libc/env-set_var-data-race.rs

RalfJung · 2024-09-09T13:11:00Z

Sadly github makes this PR basically unreviewable... I told it to hide all stderr differences but it still only loads the first half of the .rs file diffs, making it extremely tedious to look at the remaining .rs file diffs. Is there some git command to exclude some file name patterns from a commit diff?

EDIT: yes, there is

git show FETCH_HEAD -- ':(exclude)*.stderr'

Cargo.toml

tests/ui.rs

RalfJung · 2024-09-09T13:23:11Z

Oh fun. Line ending failures I think

This fails locally even when I pass --bless. In fact something seems quite wrong, since I am getting

error: actual output differed from expected

when --bless is set.

The --bless flag is turned into the RUSTC_BLESS env var, and that seems to be ignored now.

tests/ui.rs

RalfJung · 2024-09-09T15:32:26Z

I can run the native tests with --bless and push that to this branch -- once --bless works again.

oli-obk · 2024-09-09T15:57:47Z

I'll fix that, tho you can use -- -- --bless until then

RalfJung · 2024-09-09T16:29:12Z

Lolwhat?^^ Two -- makes no sense to me... ./miri does not eat a --, in fact it adds an extra -- before the flags you give and then passes that to cargo test.

But yeah, that actually worked. :)

oli-obk · 2024-09-09T17:08:01Z

Yea, we need to escape cargo test and then escape the normal test binaries, and finally the ui_test harness eats that flag

RalfJung · 2024-09-09T17:17:46Z

A single -- should work then since ./miri test already escapes cargo test.

RalfJung · 2024-09-09T17:19:43Z

Seems like this test...

//@only-target: x86_64: uses x86 target features
//@ignore-target: x86_64-apple-darwin: that target actually has ssse3

... is now being run on x86_64-apple-darwin, which it should not be.

oli-obk · 2024-09-11T13:16:20Z

miri-script/src/commands.rs

+        // For `--dep` we need to set the env var instead of passing the flag.
+        if !dep {
+            if let Some(target) = &target {
+                early_flags.push("--target".into());
+                early_flags.push(target.into());
+            }
        }


hmm now it's not setting the target anymore, before it was setting it twice. not sure when I'll get around to debugging this, probably not this week

RalfJung · 2024-09-13T09:47:23Z

ci/ci.sh

@@ -76,6 +76,9 @@ function run_tests {
    time HYPERFINE="hyperfine -w0 -r1" ./miri bench $TARGET_FLAG
  fi

+  ## Test that `miri run` with dependencies works
+  ./miri run $TARGET_FLAG --dep tests/pass-dep/getrandom.rs


I'm going to move this in its own PR, it shouldn't be blocked on the ui_test update.

bors · 2024-09-13T15:36:44Z

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

oli-obk · 2024-09-16T11:24:46Z

@rustbot ready

RalfJung

LGTM apart from some nits.

miri-script/src/commands.rs

tests/ui.rs

tests/pass/shims/x86/intrinsics-sha.rs

RalfJung · 2024-09-16T21:09:24Z

Looks great, thanks! r=me when CI is happy. :)

oli-obk · 2024-09-17T06:31:12Z

@bors r+

bors · 2024-09-17T06:31:14Z

📌 Commit 059dbb7 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2024-09-17T06:32:21Z

⌛ Testing commit 059dbb7 with merge 22d9817...

bors · 2024-09-17T06:59:05Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 22d9817 to master...

oli-obk force-pushed the ui_test_26_1 branch 2 times, most recently from 39771ca to 1fdb363 Compare September 8, 2024 08:01

oli-obk commented Sep 8, 2024

View reviewed changes

tests/pass/shims/x86/intrinsics-x86-adx.rs Outdated Show resolved Hide resolved

oli-obk commented Sep 8, 2024

View reviewed changes

tests/ui.rs Outdated Show resolved Hide resolved

oli-obk mentioned this pull request Sep 8, 2024

run global filters before file local filters oli-obk/ui_test#269

Merged

2 tasks

oli-obk force-pushed the ui_test_26_1 branch from 1fdb363 to 3c06b86 Compare September 8, 2024 13:22

oli-obk commented Sep 8, 2024

View reviewed changes

tests/ui.rs Outdated Show resolved Hide resolved

oli-obk force-pushed the ui_test_26_1 branch from 3c06b86 to 8776642 Compare September 8, 2024 20:25