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

Fix two UI tests with locale-dependent output #54813

Merged
merged 1 commit into from
Oct 7, 2018
Merged

Fix two UI tests with locale-dependent output #54813

merged 1 commit into from
Oct 7, 2018

Conversation

petrochenkov
Copy link
Contributor

Closes #54719

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 Oct 4, 2018
@petrochenkov petrochenkov mentioned this pull request Oct 4, 2018
Closed
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 4, 2018

📌 Commit 910bb8d492b785226c2950ac85285ca6c849ca10 has been approved by alexcrichton

@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 Oct 4, 2018
@petrochenkov
Copy link
Contributor Author

(Wording tweak.)
@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Oct 5, 2018

📌 Commit a7cce47 has been approved by alexcrichton

@ljedrz ljedrz mentioned this pull request Oct 5, 2018
Merged
@bors
Copy link
Contributor

bors commented Oct 7, 2018

⌛ Testing commit a7cce47 with merge 7d484ac05ad219604176cad7b59006a217008b52...

@bors
Copy link
Contributor

bors commented Oct 7, 2018

💔 Test failed - status-travis

@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 Oct 7, 2018
@petrochenkov
Copy link
Contributor Author

[01:36:14] ---- src/test/rustdoc/test_option_check/test.rs - Foo (line 18) stdout ----

[01:36:14] error: linking with cc failed: signal: 4

[01:36:14] |

[01:36:14] = note: "cc" "-m32" "-L" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.0.rcgu.o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.1.rcgu.o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.2.rcgu.o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.3.rcgu.o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.4.rcgu.o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out.rust_out.7rcbfp3g-cgu.5.rcgu.o" "-o" "/var/folders/bb/n7t3rs157850byt_jfdcq9k80000gn/T/rustdoctestMmxavp/rust_out" "-Wl,-dead_strip" "-nodefaultlibs" "-L" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "-L" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/rustdoc/test_option_check/test/auxiliary" "-L" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "-lstd-63814e2fd33f3ffa" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib/libcompiler_builtins-842d45689a426bce.rlib" "-lSystem" "-lresolv" "-lpthread" "-lc" "-lm"

Spurious, @bors retry

@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 Oct 7, 2018
@bors
Copy link
Contributor

bors commented Oct 7, 2018

⌛ Testing commit a7cce47 with merge 5a6f122...

bors added a commit that referenced this pull request Oct 7, 2018
@bors
Auto merge of #54813 - petrochenkov:uilocale, r=alexcrichton
5a6f122 
Fix two UI tests with locale-dependent output

Closes #54719
@bors
Copy link
Contributor

bors commented Oct 7, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 5a6f122 to master...

@bors bors merged commit a7cce47 into rust-lang:master Oct 7, 2018
@petrochenkov petrochenkov deleted the uilocale branch June 5, 2019 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@petrochenkov @rust-highfive @alexcrichton @bors