Use libtest from crates.io for compiletest

[bjorn3]

This fixes using latest nightly + local-rebuild=true for testing

Fixes #58890 and #59264

[rust-highfive]

r? @alexcrichton

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

[alexcrichton]

@bors: r+

cc @gnzlbg

[bors]

📌 Commit 4522d6848b09246072130cc3945e9497c8b95610 has been approved by alexcrichton

[gnzlbg]

LGTM. @alexcrichton would it be possible to give this higher priority ?

[alexcrichton]

@bors: p=1

[bors]

⌛ Testing commit 4522d6848b09246072130cc3945e9497c8b95610 with merge a1a6bc9b263d87af33263f9a16e24ba1441f8446...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job dist-aarch64-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

######################################################################    98.4%
######################################################################## 100.0%
[00:23:34] extracting /checkout/obj/build/cache/2019-02-27/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:23:34]     Updating crates.io index
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

[Mark-Simulacrum]

@bors r-

Can we remove the #![feature(test)] from compiletest, too?

[bjorn3]

Done

[gnzlbg]

Can we remove the #![feature(test)] from compiletest, too?

@bjorn3 have you checked that removing the #[feature(test)] still lets you to use libtest as a dependency ? libtest 0.0.1 on crates.io requires the test feature to be enabled.

[bjorn3]

Oops didn't test. Force pushed that commit away.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 4522d6848b09246072130cc3945e9497c8b95610 has been approved by alexcrichton

[bors]

⌛ Testing commit 4522d6848b09246072130cc3945e9497c8b95610 with merge 19db5af84833b010d99b76bcabcbafd6f215f5f1...

[bors]

💔 Test failed - status-appveyor

[bors]

📌 Commit 97262760bf9fce244ef73c69390dbcb246c1e28b has been approved by Manishearth

[bors]

🔒 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 use_crates_io_libtest (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 use_crates_io_libtest --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

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[bjorn3]

Rebased

[Xanewok]

@bors r=Manishearth

[bors]

📌 Commit 8516a88 has been approved by Manishearth

[bors]

⌛ Testing commit 8516a88 with merge e065a87849d312c9451d68b37195f3ff399bfa25...

[bors]

💔 Test failed - status-appveyor

[bjorn3]

On windows libtest seems to use rustc_term which doesn't depend on libc but uses it on windows. I unfortunately couldn't find its repo, so I had to look in the cargo cache for it. (https://github.com/rust-lang/libtest is linked as repo but that doesn't contain its source)

[gnzlbg]

We should probably close this PR, since the change that motivated it was reverted.

What we'd probably want to do, is update compiletest-rs to contain the latest upstream changes, remove compiletest from rust-lang Rust, and make it use the one from crates.io . Then it will be one thing less we'd have to update when we try to split libtest again.

[bjorn3]

Okay

[Manishearth]

@gnzlbg given the weird build system errors we were experiencing it may be worth testing out libtest as a part of compiletest first. But works either way, really.

[gnzlbg]

@manish compiletest-rs would just continue to just use the “test” crate on nightly. That should work both in and out of tree (for stable Rust a different crate is used).

[Manishearth]

I mean, ideally, as a part of this compiletest-rs becomes stable-only, since libtest is stable

[gnzlbg]

libtest on crates.io does not work on stable Rust.

…

On Sun 14. Apr 2019 at 17:38, Manish Goregaokar ***@***.***> wrote: I mean, ideally, as a part of this compiletest-rs becomes stable-only, since libtest is stable — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#59381 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA3Npqnbl66TQ-JpNnFLkjsQ7rT0hI7nks5vg0uJgaJpZM4cE1Lg> .

[Manishearth]

What's the reason behind that? Can we fix that first?

[gnzlbg]

We could, There is a PR open to libtest that does that, but it’s unclear whether that libtest can be used in tree.

[Manishearth]

Ah.