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

Reduce the usage of features in compiletest and libtest #43180

Merged
merged 1 commit into from Jul 14, 2017
Merged

Reduce the usage of features in compiletest and libtest #43180

merged 1 commit into from Jul 14, 2017

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 12, 2017

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

oli-obk
oli-obk commented Jul 12, 2017
View reviewed changes
Copy link
Contributor Author

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the libc dependency. Is there any reason rustc doesn't use the crates.io version everywhere?

src/libtest/lib.rs Outdated
#![feature(set_stdio)]
#![feature(staged_api)]
#![feature(panic_unwind)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is weird. Is this like a compile-time check whether unwinding is active?

src/libtest/lib.rs Outdated
@@ -34,10 +34,7 @@
#![deny(warnings)]

#![feature(asm)]
#![feature(libc)]
#![feature(rustc_private)]
#![feature(set_stdio)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't get rid of this one yet, since there'd be no way to capture the stderr and stdout of tests.

src/libtest/lib.rs Outdated
@@ -34,10 +34,7 @@
#![deny(warnings)]

#![feature(asm)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is needed for black_box.

src/tools/compiletest/src/main.rs
@@ -10,9 +10,7 @@

#![crate_name = "compiletest"]

#![feature(box_syntax)]
#![feature(test)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to get rid of the dependence of compiletest on the test crate entirely. I don't really see any reason for this dependency to exist except some minor code sharing. The major blocker is the run_test function that is called in the test crate.

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 12, 2017

travis failure looks spurious

Attempting with retry: make prepare
[00:00:30] downloading https://static.rust-lang.org/dist/2017-06-15/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz
######################################################################## 100.0%
[00:00:38] extracting /checkout/obj/build/cache/2017-06-15/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz
[00:00:38] downloading https://static.rust-lang.org/dist/2017-06-15/rustc-beta-x86_64-unknown-linux-gnu.tar.gz
######################################################################## 100.0%
[00:00:42] extracting /checkout/obj/build/cache/2017-06-15/rustc-beta-x86_64-unknown-linux-gnu.tar.gz
[00:00:42] downloading https://static.rust-lang.org/dist/2017-06-15/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
######################################################################## 100.0%
[00:00:43] extracting /checkout/obj/build/cache/2017-06-15/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:00:43]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:00:49]     Updating git repository `https://github.com/rust-lang/cargo`
[00:00:54]     Updating git repository `https://github.com/rust-lang-nursery/rustfmt`
[00:00:58] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:58] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:58] Build completed unsuccessfully in 0:00:27
[00:00:58] make: *** [prepare] Error 1
[00:00:58] Makefile:76: recipe for target 'prepare' failed
[00:00:58] Command failed. Attempt 2/5:
[00:00:58] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:58] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:58] Build completed unsuccessfully in 0:00:00
[00:00:58] Makefile:76: recipe for target 'prepare' failed
[00:00:58] make: *** [prepare] Error 1
[00:00:58] Command failed. Attempt 3/5:
[00:00:58] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:58] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:58] Build completed unsuccessfully in 0:00:00
[00:00:58] Makefile:76: recipe for target 'prepare' failed
[00:00:58] make: *** [prepare] Error 1
[00:00:58] Command failed. Attempt 4/5:
[00:00:58] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:58] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:58] Build completed unsuccessfully in 0:00:00
[00:00:58] make: *** [prepare] Error 1
[00:00:58] Makefile:76: recipe for target 'prepare' failed
[00:00:58] Command failed. Attempt 5/5:
[00:00:58] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:58] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:58] Build completed unsuccessfully in 0:00:00
[00:00:58] Makefile:76: recipe for target 'prepare' failed
[00:00:58] make: *** [prepare] Error 1
[00:00:58] The command has failed after 5 attempts.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.

@oli-obk oli-obk closed this Jul 12, 2017
@oli-obk oli-obk reopened this Jul 12, 2017
@alexcrichton
Copy link
Member

I don't think the travis failure is spurious, can you rerun ./x.py build locally, commit the changes to Cargo.lock, and push those up?

@aidanhs aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 13, 2017
@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 13, 2017

oh... This is cargo's Cargo.lock, which is in a git submodule... So... I need to open a PR against cargo first?

@alexcrichton
Copy link
Member

Did you try running ./x.py build and see if src/Cargo.lock change? Submodule updates shouldn't be necessary in theory.

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 14, 2017

You're right.

This time it's definitely not me though:

remote: Counting objects: 656585, done.
remote: Compressing objects: 100% (123194/123194), done.
error: RPC failed; curl 56 SSLRead() return error -36
fatal: The remote end hung up unexpectedly
fatal: early EOF
fatal: index-pack failed

@oli-obk oli-obk closed this Jul 14, 2017
@oli-obk oli-obk reopened this Jul 14, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 14, 2017

📌 Commit cb92ab9 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 14, 2017

⌛ Testing commit cb92ab9 with merge 6d9d82d...

bors added a commit that referenced this pull request Jul 14, 2017
@bors
Auto merge of #43180 - oli-obk:compiletest, r=alexcrichton
6d9d82d 
Reduce the usage of features in compiletest and libtest
@bors
Copy link
Contributor

bors commented Jul 14, 2017

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

@bors bors merged commit cb92ab9 into rust-lang:master Jul 14, 2017
@jonas-schievink jonas-schievink mentioned this pull request Jul 23, 2017
Closed
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-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@oli-obk @rust-highfive @alexcrichton @bors @aidanhs