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.

Sign up for GitHub

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

Jump to bottom

Move most ui-fulldeps tests to ui/ #109875

Merged
merged 2 commits into from
Apr 14, 2023
Merged

Move most ui-fulldeps tests to ui/ #109875

merged 2 commits into from
Apr 14, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 3, 2023

Same rationale as #109770, they don't actually need a stage 2 build.

This increases the limit for the UI directory because otherwise it was annoying to be constantly moving files into subdirectories when I fixed a test; #109873 makes up for it.

cc #109770, #109874

@rustbot
Copy link
Collaborator

rustbot commented Apr 3, 2023

r? @lcnr

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 3, 2023
@jyn514
Copy link
Member Author

jyn514 commented Apr 3, 2023

@bors rollup=iffy (fulldeps tests weren't cross-compiled before)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@jyn514 jyn514 force-pushed the no-fulldeps branch 2 times, most recently from aa164e1 to b7b79f3 Compare April 5, 2023 11:56
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 8, 2023
@jyn514
Copy link
Member Author

jyn514 commented Apr 9, 2023

Ok, this is finally ready for review - sorry for the noise while I got CI working, didn't have access to my fast computer the last couple weeks.

@jyn514 jyn514 mentioned this pull request Apr 9, 2023
Open
5 tasks
@compiler-errors
Copy link
Member

r? @compiler-errors @bors r+

@bors
Copy link
Contributor

bors commented Apr 9, 2023

📌 Commit 8637f65d61984bafbecdd33df834f4b4a3ab7e1d has been approved by compiler-errors

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 Apr 9, 2023
@rustbot rustbot unassigned lcnr Apr 9, 2023
@bors
Copy link
Contributor

bors commented Apr 9, 2023

⌛ Testing commit 8637f65d61984bafbecdd33df834f4b4a3ab7e1d with merge e84dee7b01ca95dec55109273d23b4701e5fbdc7...

@bors
Copy link
Contributor

bors commented Apr 9, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 9, 2023
@jyn514
Copy link
Member Author

jyn514 commented Apr 12, 2023

@bors r=compiler-errors rollup=iffy

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit d3ca73719597b5c28892c40b04071f0977f9ba63 has been approved by compiler-errors

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 Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

⌛ Testing commit d3ca73719597b5c28892c40b04071f0977f9ba63 with merge 3f54d5b565f331064e17627a1255aae126042284...

@bors
Copy link
Contributor

bors commented Apr 12, 2023

💔 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 Apr 12, 2023
@compiler-errors
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jyn514
Copy link
Member Author

jyn514 commented Apr 14, 2023

I'm going to disable issue-13560.rs when cross-compiling for now. It needs something like a // needs-crate-type-dynamic header, which doesn't exist today, and the fulldeps tests previously weren't cross-compiled anyway.

jyn514 and others added 2 commits April 13, 2023 22:08
@jyn514
Move most ui-fulldeps tests to ui
2ffb0de 
They pass fine. Only tests that required `extern crate rustc_*` or were
marked `ignore-stage1` have been keep in fulldeps.
@jyn514
Fix tests on wasm
88ee6e5 
The `std` test straightforwardly can't work without file descriptors;
 rust-lang#99417 tracks moving it out of tests/ui.

`issue-13560.rs` requires the target to support dynamic linking.

`extern-mod-syntax` is interesting. The original test was added to check
if `extern mod` could be parsed correctly and used `extern mod std` and
an import:
rust-lang@138dc30#diff-73700e1e851b7a37bc92174635dab726124c82e5bfabbbc45b4a3c2e8e14fadd
At some point `std::json::Object` was moved out of std to an unstable
rustc-only `extras` crate, and rather than just changing the import it
got changed to use the unstable crate. When `extras` was removed, people
assumed the test was meant to also test rustc_private and changed it to
another unstable crate rather than using something in std.

This changes the test to remove the `rustc_private` import, to allow it
to work properly when cross-compiling.
@jyn514
Copy link
Member Author

jyn514 commented Apr 14, 2023

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit 88ee6e5 has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2023
@bors
Copy link
Contributor

bors commented Apr 14, 2023

⌛ Testing commit 88ee6e5 with merge d558796...

@bors
Copy link
Contributor

bors commented Apr 14, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing d558796 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2023
@bors bors merged commit d558796 into rust-lang:master Apr 14, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 14, 2023
@jyn514 jyn514 deleted the no-fulldeps branch April 14, 2023 06:46
@bors bors mentioned this pull request Apr 14, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d558796): 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

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

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

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@compiler-errors compiler-errors

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@jyn514 @rustbot @rust-log-analyzer @bors @compiler-errors @rust-timer @lcnr