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

Fix cfg of platform-specific tests #1126

Merged
merged 1 commit into from
Jan 5, 2015

Conversation

akosthekiss
Copy link
Contributor

For two tests, the Cargo.tomls and the cfgs don't match. E.g., the first test expects a successful build on all linux platforms but its toml is prepared for Intel linuxes only. The second test is very similar.

Here, the cfgs are amended to match the tomls.

@alexcrichton
Copy link
Member

@bors: r+ c8f4ecc

@bors
Copy link
Contributor

bors commented Jan 5, 2015

⌛ Testing commit c8f4ecc with merge d2a455f...

@bors
Copy link
Contributor

bors commented Jan 5, 2015

💔 Test failed - cargo-win-32

@akosthekiss
Copy link
Contributor Author

Travis is reporting failures on linux (on tests I haven't touched and also the build stalled), and homu is reporting a timeout for win32. On my linux box everything works fine. Not sure what's wrong...

@alexcrichton
Copy link
Member

Ah yeah these failures are benign.

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 5, 2015

⌛ Testing commit c8f4ecc with merge 56e9314...

bors added a commit that referenced this pull request Jan 5, 2015
For two tests, the `Cargo.toml`s and the `cfg`s don't match. E.g., the first test expects a successful build on all linux platforms but its `toml` is prepared for Intel linuxes only. The second test is very similar.

Here, the `cfg`s are amended to match the `toml`s.
@bors
Copy link
Contributor

bors commented Jan 5, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit c8f4ecc into rust-lang:master Jan 5, 2015
@akosthekiss akosthekiss deleted the pr-test_cargo_compile branch January 5, 2015 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants