Skip to content

Update to a compiletest-rs version that requires //@ for commands #10669

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

Merged
merged 1 commit into from
Apr 20, 2023

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Apr 19, 2023

Requires Manishearth/compiletest-rs#261 to get published

This PR is a smaller step towards #10426

changelog: Move to a version of compiletest-rs that allows us to require //@ for test suite commands.

@rustbot
Copy link
Collaborator

rustbot commented Apr 19, 2023

r? @Alexendoo

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Apr 19, 2023
@oli-obk

This comment was marked as resolved.

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 20, 2023

This works now and depends only on the latest crates.io release of compiletest-rs

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 20, 2023

I checked that this PR does not add any new files and deleted the preexisting stray .stderr file.

The other review comments have also been addressed by reverting the changes to what they are on master.

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 20, 2023

Sorry about that back and forth. This time I went through all 400 changed .rs files and removed all but the //@ changes (except in one or two cases where command flags were just wrong)

@Alexendoo
Copy link
Member

Thanks! Works on windows & aarch64 linux so let's get this merge rolling

@bors r+ p=1

p.s. checking out a branch called @ was a nice little puzzle 😅

@bors
Copy link
Contributor

bors commented Apr 20, 2023

📌 Commit def1705 has been approved by Alexendoo

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 20, 2023

⌛ Testing commit def1705 with merge 06dace2...

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 20, 2023

p.s. checking out a branch called @ was a nice little puzzle

I will strive to pick a harder branch name next time

@bors
Copy link
Contributor

bors commented Apr 20, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Alexendoo
Pushing 06dace2 to master...

@bors bors merged commit 06dace2 into rust-lang:master Apr 20, 2023
bors added a commit that referenced this pull request Jun 5, 2023
Add a test that checks for old style test headers

Follow up to #10669, we're pretty used to them so they're easy to slip through

changelog: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants