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

Ignore two tests on s390x #57078

Merged
merged 2 commits into from
Dec 24, 2018
Merged

Ignore two tests on s390x #57078

merged 2 commits into from
Dec 24, 2018

Conversation

glaubitz
Copy link
Contributor

Ignore two tests on s390x which don't make sense on s390x as they are x86-specific.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2018
@nikic
Copy link
Contributor

nikic commented Dec 23, 2018

@bors r+ rollup

Would be nice to have something like only-x86 to avoid these types of lists.

@bors
Copy link
Contributor

bors commented Dec 23, 2018

📌 Commit ecdbcad has been approved by nikic

@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 Dec 23, 2018
@petrochenkov
Copy link
Contributor

@nikic
We do have only-x86.
Not sure how multiple only directives work though, e.g.

// only-x86
// only-x86_64

From compiletest code it seems like it does the right thing.

@nikic
Copy link
Contributor

nikic commented Dec 23, 2018

Ah, right! Looks like it marks the test as ignored if any of the only lines do not match, so having multiple only lines will never run the test:

if config.has_cfg_prefix(ln, "only") {
props.ignore = match config.parse_cfg_name_directive(ln, "only") {
ParsedNameDirective::Match => props.ignore,
ParsedNameDirective::NoMatch => Ignore::Ignore,
ParsedNameDirective::MatchLldb => props.ignore.no_gdb(),
ParsedNameDirective::MatchGdb => props.ignore.no_lldb(),
};
}

Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2018
Ignore two tests on s390x

Ignore two tests on s390x which don't make sense on s390x as they are x86-specific.
bors added a commit that referenced this pull request Dec 24, 2018
Rollup of 14 pull requests

Successful merges:

 - #56188 (enum type instead of variant suggestion unification )
 - #56342 (Improve docs for collecting into `Option`s)
 - #56916 (Fix mutable references in `static mut`)
 - #56917 (Simplify MIR generation for logical operations)
 - #56939 (Pin stabilization)
 - #56953 (Mark tuple structs as live if their constructors are used)
 - #56964 (Remove `TokenStream::JointTree`.)
 - #56966 (Correct strings for raw pointer deref and array access suggestions)
 - #57020 (Point to cause of `fn` expected return type)
 - #57032 (fix deprecation warnings in liballoc benches)
 - #57053 (Fix alignment for array indexing)
 - #57062 (Fix a comment)
 - #57067 (Stabilize min_const_unsafe_fn in 1.33)
 - #57078 (Ignore two tests on s390x)

Failed merges:

r? @ghost
@bors bors merged commit ecdbcad into rust-lang:master Dec 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants