Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump ui_test to 0.22.2 #3686

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bump ui_test to 0.22.2 #3686

wants to merge 2 commits into from

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jun 19, 2024

This is almost #3279, but working?

Can't currently bump to ui_test 0.22.3, as tests start failing (but contains oli-obk/ui_test#196, which i kind-of manually included here).

Interaction with target around is annoying and I'm not sure that this working as intended.

@@ -11,7 +11,7 @@ LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
note: inside `main`
--> $DIR/windows_join_detached.rs:LL:CC
Copy link
Member

Choose a reason for hiding this comment

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

Why is this not being normalized any more?

Copy link
Contributor Author

@klensy klensy Jun 19, 2024

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Yeah we probably want to add that normalization ourselves then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added workaround, now it's works almost as before.


if config.host != config.target {
Copy link
Member

Choose a reason for hiding this comment

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

Why can't we always set --target?

Copy link
Contributor Author

@klensy klensy Jun 19, 2024

Choose a reason for hiding this comment

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

*-dep tests start passing double --target args to rustc which fails because of that. Better solution is update to 0.22.3 (which currently blocked by other error:

   0: `ui_test` does not support crates that appear as both build-dependencies and core dependencies: registry+https://github.com/rust-lang/crates.io-index#[email protected]: Ok(
          [
              "G:\\projs\\miri\\target\\ui\\miri\\debug\\build\\getrandom-2ad1c3a3bc87ffc2\\build-script-build.exe",
              "G:\\projs\\miri\\target\\ui\\miri\\debug\\build\\getrandom-2ad1c3a3bc87ffc2\\build_script_build.pdb",
          ],
      ) vs Ok(
          [
              "G:\\projs\\miri\\target\\ui\\miri\\x86_64-pc-windows-msvc\\debug\\deps\\libgetrandom-6899ae83d1ae81e1.rlib",
              "G:\\projs\\miri\\target\\ui\\miri\\x86_64-pc-windows-msvc\\debug\\deps\\libgetrandom-6899ae83d1ae81e1.rmeta",
          ],
      )

```)

Copy link
Member

Choose a reason for hiding this comment

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

But why is that only a problem with host == target...? Very strange.

Anyway, please add a comment in the code.

Copy link
Member

Choose a reason for hiding this comment

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

It seems to be a problem with host != target as well, judging from the CI failures

error: Option 'target' given more than once

I think ui_test 0.22 may be too buggy for us, unfortunately. We'll probably have to wait for 0.24 as 0.23 suffers from oli-obk/ui_test#238.

@klensy klensy force-pushed the ui_test_bump branch 2 times, most recently from 89dbd45 to 73284f9 Compare June 20, 2024 09:20
@RalfJung RalfJung added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Jun 20, 2024
@bors
Copy link
Collaborator

bors commented Aug 5, 2024

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

@RalfJung
Copy link
Member

@klensy do you still plan to get back to this PR?
It should probably update ui_test to 0.24, since 0.22 has some issue with --target.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: Waiting for the PR author to address review comments
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants