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

Move some tests in src/test/compile-fail -> src/test/ui #62177

Closed

Conversation

@Centril
Copy link
Member

commented Jun 27, 2019

This is a subset of #62113.

Hopefully everything here sticks, but if it doesn't I'll remove tests until it does.

r? @petrochenkov

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jun 27, 2019

Yay! Initial tests seem to pass at least.

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

Some of these are going to fail on wasm, IIRC.
If you are on Linux, could you run the docker image for the wasm target and see whether it fails?

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

r=me after the wasm check

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jun 27, 2019

If you are on Linux, could you run the docker image for the wasm target and see whether it fails?

@petrochenkov Will do. Should I ignore tests for the wasm target if they fail?

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

Splitting into ignore-wasm and only-wasm would be better.

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

(Since they "fail" by producing platform-dependent output, rather than by really failing.)

@Centril Centril force-pushed the Centril:move-some-compile-fail-tests branch from 477fb6c to 6d4c642 Jun 29, 2019

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jun 29, 2019

Tested wasm with ./src/ci/docker/run.sh test-various and made some fixes. Hopefully this will stick now but I won't say it's a sure thing...

@bors r=petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 29, 2019

📌 Commit 6d4c642 has been approved by petrochenkov


error[E0463]: can't find crate for `std`
|
= note: the `wasm32-unknown-unknown` target may not be installed

This comment has been minimized.

Copy link
@RalfJung

RalfJung Jun 29, 2019

Member

You could also use normalization to get rid of these two lines. Then you don't need to duplicate tests.

This comment has been minimized.

Copy link
@RalfJung

RalfJung Jun 29, 2019

Member

I have e.g. used the following to normalize away entire lines in other tests:

// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""

This comment has been minimized.

Copy link
@petrochenkov

petrochenkov Jun 29, 2019

Contributor

Hm, this is great news.
For some reason I thought the normalization works per-line.

This comment has been minimized.

Copy link
@petrochenkov

petrochenkov Jun 29, 2019

Contributor

Much simpler to fix platform-dependent tests this way.

This comment has been minimized.

Copy link
@RalfJung

RalfJung Jun 29, 2019

Member

I think the matching of the normalization pattern is per-line -- but if you include the final \n, you can remove the entire line. And then that's handled correctly when comparing later.

This comment has been minimized.

Copy link
@Centril

Centril Jun 29, 2019

Author Member

I'll have a look at this tomorrow; in the meantime feel free to r- or we can do this in a follow up PR if that's alright with y'all.

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 2, 2019

Rollup merge of rust-lang#62177 - Centril:move-some-compile-fail-test…
…s, r=petrochenkov

Move some tests in src/test/compile-fail -> src/test/ui

This is a subset of rust-lang#62113.

Hopefully everything here sticks, but if it doesn't I'll remove tests until it does.

r? @petrochenkov

bors added a commit that referenced this pull request Jul 2, 2019

Auto merge of #62294 - Manishearth:rollup-y7ejw2l, r=Manishearth
Rollup of 16 pull requests

Successful merges:

 - #61871 (Don't use lift to detect local types)
 - #61883 (`non_ascii_idents` lint (part of RFC 2457))
 - #61922 (Don't store locals that have been moved from in generators)
 - #61995 (rustc: use a separate copy of P for HIR than for AST.)
 - #62026 (Final nail in `rand 0.4` coffin)
 - #62039 (Remove needless lifetimes (rustc))
 - #62099 (Remove io::Result from syntax::print)
 - #62103 (Add debug assertions to write_bytes and copy*)
 - #62133 (Feature gate `rustc` attributes harder)
 - #62161 (Add missing links for TryFrom docs)
 - #62177 (Move some tests in src/test/compile-fail -> src/test/ui)
 - #62183 (std: Move a process test out of libstd)
 - #62186 (Add missing type urls in Into trait)
 - #62196 (Add Vec::leak)
 - #62199 (import gdb for explicit access to gdb.current_objfile())
 - #62244 (Update rustfmt to 1.3.1)

Failed merges:

 - #62243 (Improve documentation for built-in macros)

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 2, 2019

@bors r-

Failed in #62294 (comment).

Will try the normalization strategy instead.

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 4, 2019

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

@chocol4te

This comment has been minimized.

Copy link
Contributor

commented Jul 23, 2019

@Centril Ping from triage regarding the merge conflicts! :)

@JohnCSimon

This comment has been minimized.

Copy link

commented Aug 3, 2019

@Centril @petrochenkov Ping from triage, this is so close! :)

@gagan0723

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

Third ping from triage, @Centril any updates on this?

Note: Thanks for the PR. This will be closed and marked as S-inactive-closed next week. Feel free to re-open when you have time.

Thanks

@Centril

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

Closing for now until I have time to get back to it :)

@Centril Centril closed this Aug 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.