Skip to content

Default test support's Execs to exit code 0#5852

Merged
bors merged 4 commits intorust-lang:masterfrom
dwijnand:exit-code-0
Aug 3, 2018
Merged

Default test support's Execs to exit code 0#5852
bors merged 4 commits intorust-lang:masterfrom
dwijnand:exit-code-0

Conversation

@dwijnand
Copy link
Copy Markdown
Contributor

@dwijnand dwijnand commented Aug 2, 2018

Refs #5742

@rust-highfive
Copy link
Copy Markdown

r? @alexcrichton

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

@alexcrichton
Copy link
Copy Markdown
Member

Nice! If you'd like it's also fine to make the tests nightly only instead of adding a method to ignore the status too

@alexcrichton
Copy link
Copy Markdown
Member

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 2, 2018

📌 Commit 925c2102b7d5d149347fa5d639744e94eba771fb has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 2, 2018

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout exit-code-0 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self exit-code-0 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging tests/testsuite/tool_paths.rs
Auto-merging tests/testsuite/test.rs
CONFLICT (content): Merge conflict in tests/testsuite/test.rs
Auto-merging tests/testsuite/support/mod.rs
Auto-merging tests/testsuite/rustdoc.rs
Auto-merging tests/testsuite/rustc.rs
Auto-merging tests/testsuite/run.rs
Auto-merging tests/testsuite/required_features.rs
Auto-merging tests/testsuite/rename_deps.rs
Auto-merging tests/testsuite/read_manifest.rs
Auto-merging tests/testsuite/profiles.rs
Auto-merging tests/testsuite/profile_targets.rs
Auto-merging tests/testsuite/profile_overrides.rs
Auto-merging tests/testsuite/profile_config.rs
Auto-merging tests/testsuite/path.rs
Auto-merging tests/testsuite/package.rs
Auto-merging tests/testsuite/metadata.rs
Auto-merging tests/testsuite/git.rs
Auto-merging tests/testsuite/freshness.rs
Auto-merging tests/testsuite/fix.rs
CONFLICT (content): Merge conflict in tests/testsuite/fix.rs
Auto-merging tests/testsuite/doc.rs
Auto-merging tests/testsuite/cross_compile.rs
Auto-merging tests/testsuite/config.rs
Auto-merging tests/testsuite/clean.rs
Auto-merging tests/testsuite/check.rs
CONFLICT (content): Merge conflict in tests/testsuite/check.rs
Auto-merging tests/testsuite/build_script.rs
Auto-merging tests/testsuite/build_plan.rs
Auto-merging tests/testsuite/build_lib.rs
Auto-merging tests/testsuite/build.rs
CONFLICT (content): Merge conflict in tests/testsuite/build.rs
Auto-merging tests/testsuite/bench.rs
CONFLICT (content): Merge conflict in tests/testsuite/bench.rs
Auto-merging tests/testsuite/bad_config.rs
Automatic merge failed; fix conflicts and then commit the result.

@dwijnand
Copy link
Copy Markdown
Contributor Author

dwijnand commented Aug 2, 2018

Curiously bors didn't notify of the even newer merge conflict in tests/testsuite/fix.rs. I'll sort that now.

@dwijnand
Copy link
Copy Markdown
Contributor Author

dwijnand commented Aug 3, 2018

Looking for an r+ for old bors-y before this conflicts again 😀

@alexcrichton
Copy link
Copy Markdown
Member

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 3, 2018

📌 Commit b1d6a7e has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 3, 2018

⌛ Testing commit b1d6a7e with merge 61655aa9fed517d4b415027bc25d7fa16a444dd3...

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 3, 2018

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Copy Markdown
Member

@bors: retry

@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 3, 2018

⌛ Testing commit b1d6a7e with merge 135ef53...

bors added a commit that referenced this pull request Aug 3, 2018
Default test support's Execs to exit code 0

Refs #5742
@bors
Copy link
Copy Markdown
Contributor

bors commented Aug 3, 2018

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

@bors bors merged commit b1d6a7e into rust-lang:master Aug 3, 2018
@dwijnand dwijnand deleted the exit-code-0 branch August 3, 2018 17:24
@ehuss ehuss added this to the 1.29.0 milestone Feb 6, 2022
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.

5 participants