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

Number of filtered out tests in tests summary #41910

Merged
merged 1 commit into from
May 19, 2017
Merged

Number of filtered out tests in tests summary #41910

merged 1 commit into from
May 19, 2017

Conversation

mersinvald
Copy link
Contributor

Closes #31905

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @BurntSushi (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@mersinvald
Copy link
Contributor Author

cc @Mark-Simulacrum
r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Changes look good to me. Could you squash your changes into one commit? Thanks!

@mersinvald
Copy link
Contributor Author

mersinvald commented May 11, 2017

@Mark-Simulacrum I'm not sure how. "Merge pull request" button is not availible for me, I don't know other ways so squash commits in pull request other then this button's variant.

UPD: Figured it out with git rebase

@Mark-Simulacrum
Copy link
Member

Sorry about that. I should have provided instructions on how to squash.

Anyway, changes look good.

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2017

📌 Commit e6cde9f has been approved by Mark-Simulacrum

@mersinvald
Copy link
Contributor Author

mersinvald commented May 11, 2017

@Mark-Simulacrum no problem at all, I shouldn't have asking before googling it in the first place :)

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 11, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 12, 2017
Number of filtered out tests in tests summary

Closes rust-lang#31905
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 12, 2017
Number of filtered out tests in tests summary

Closes rust-lang#31905
@kennytm
Copy link
Member

kennytm commented May 12, 2017

@Mark-Simulacrum
Copy link
Member

Would you mind sending a PR to cargo to add the expected output there?

@Mark-Simulacrum
Copy link
Member

err, @mersinvald that is.

@Mark-Simulacrum
Copy link
Member

@bors r-

(since this breaks Cargo's tests)

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 12, 2017
@mersinvald
Copy link
Contributor Author

@Mark-Simulacrum sure, I will. I should just reference this issue in the PR to cargo, right?

@Mark-Simulacrum
Copy link
Member

Yeah, that should be fine. I'm not entirely sure how the dance with the submodule will work, though, seeing as with your PR Cargo's tests will presumably fail. But once the Cargo PR is up, ping me and @alexcrichton on it, and we should be able to work it out.

@mersinvald
Copy link
Contributor Author

@Mark-Simulacrum can you assist me through cargo testing process? How can I build cargo with my rustc version and run tests?

I have new rustc in my PATH:

$ rustc -V
rustc 1.19.0-dev (e6cde9f2a 2017-05-11)

When I do cargo test in directory with cloned cargo master, I get such errors:

$ RUSTC=/usr/local/bin/rustc LD_LIBRARY_PATH=/usr/local/lib cargo test bench_bin_implicit
error[E0514]: found crate `log` compiled by an incompatible version of rustc
 --> /home/mike/dev/rust/cargo/src/cargo/lib.rs:5:14
  |
5 | #[macro_use] extern crate log;
  |              ^^^^^^^^^^^^^^^^^
  |
  = help: please recompile that crate using this compiler (rustc 1.19.0-nightly (f1140a331 2017-05-08))
  = note: crate `log` path #1: /home/mike/dev/rust/cargo/target/debug/deps/liblog-b8e0bbfdccaf7d7a.rlib compiled by "rustc 1.19.0-dev (e6cde9f2a 2017-05-11)"

But cargo seems to use new rustc (I see N filtered out messages for other tests)
I did cargo clean.

How can I fix it?

@Mark-Simulacrum
Copy link
Member

Oh, I'm sorry I somehow missed your comment! I'm not actually entirely sure how to best do that. @alexcrichton Could you provide some guidance here? I don't know how to sync up Cargo with rustc so that the tests pass there before we merge this and vice-versa.

@alexcrichton
Copy link
Member

@mersinvald are you using rustup perhaps? If that's the case then the cargo wrapper there may be doing some extra funny business behind the scenes. Otherwise though it's probably ok if you just run cargo test, w/ the normal rustc b/c when the PR is sent to Cargo that's how the tests are run there.

@Mark-Simulacrum
Copy link
Member

@mersinvald So I've talked to @alexcrichton on IRC, and for the Cargo PR, you should just change the tests to be less strict about libtest's output so they don't break on the current and the future output (with this PR).

@euclio
Copy link
Contributor

euclio commented May 15, 2017

Any opinions on using filtered over filtered out?

bors added a commit to rust-lang/cargo that referenced this pull request May 16, 2017
…chton

Making tests less strict so they won't break on output changes

Required for rust-lang/rust#41910

cc @Mark-Simulacrum
cc @alexcrichton
bors added a commit to rust-lang/cargo that referenced this pull request May 16, 2017
…chton

Making tests less strict so they won't break on output changes

Required for rust-lang/rust#41910

cc @Mark-Simulacrum
cc @alexcrichton
@mersinvald
Copy link
Contributor Author

mersinvald commented May 17, 2017

@Mark-Simulacrum hello! Can you give me update on merging process? Pull Request to cargo is merged now. Are there some difficulties in merging this one?

@Mark-Simulacrum
Copy link
Member

I think you'll need to put up a PR that updates the cargo submodule in this repository. Once that's merged, I think we can try merging this.

@mersinvald
Copy link
Contributor Author

@Mark-Simulacrum am I right that I just need to do git pull and checkout $my_commit_hash in the src/tools/cargo dir?

@Mark-Simulacrum
Copy link
Member

I think so. I've never personally done it, but I believe the thing to Google for if that doesn't work is something along the lines of how to update a submodule.

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 17, 2017
bors added a commit that referenced this pull request May 18, 2017
@Mark-Simulacrum
Copy link
Member

@bors r+

In theory this should work now...

@bors
Copy link
Contributor

bors commented May 18, 2017

📌 Commit e6cde9f has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 18, 2017

⌛ Testing commit e6cde9f with merge a4fcd8e...

@bors
Copy link
Contributor

bors commented May 18, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member

Seems to have timed out? Or ... something? I don't see any failures

@bors retry

@alexcrichton
Copy link
Member

@Mark-Simulacrum ah yeah our time limit is 3 hours on AppVeyor, and the failing build ran for 3 hours, so likely a timeout.

@bors
Copy link
Contributor

bors commented May 18, 2017

⌛ Testing commit e6cde9f with merge 55bb4c9...

@bors
Copy link
Contributor

bors commented May 18, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

This seems to keep getting unlucky :(

@bors
Copy link
Contributor

bors commented May 19, 2017

⌛ Testing commit e6cde9f with merge b1bdd2d...

@bors
Copy link
Contributor

bors commented May 19, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented May 19, 2017

Spurious 😂. Seems to be not spurious but problem on AppVeyor's side, see #42089 (comment). Looks like the 2nd – 5th retry just fail immediately.

Log
[00:21:54] extracting C:\projects\rust\build\cache\2017-04-25\cargo-beta-i686-pc-windows-msvc.tar.gz
[00:21:54]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:22:08]     Updating git repository `https://github.com/rust-lang/cargo`
[00:22:17]     Updating git repository `https://github.com/rust-lang-nursery/rustfmt`
[00:22:20]  Downloading cmake v0.1.23
[00:22:35] error: unable to get packages from source
[00:22:35] 
[00:22:35] To learn more, run the command again with --verbose.
[00:22:35] Build completed unsuccessfully in 0:01:06
[00:22:35] make: *** [Makefile:76: prepare] Error 101
[00:22:35] Command failed. Attempt 2/5:
[00:22:35]  Downloading rustc-serialize v0.3.24
[00:22:36] error: unable to get packages from source
[00:22:36] 
[00:22:36] To learn more, run the command again with --verbose.
[00:22:36] Build completed unsuccessfully in 0:00:00
[00:22:36] make: *** [Makefile:76: prepare] Error 101
[00:22:36] Command failed. Attempt 3/5:
[00:22:36]  Downloading filetime v0.1.10
[00:22:36] error: unable to get packages from source
[00:22:36] 
[00:22:36] To learn more, run the command again with --verbose.
[00:22:36] Build completed unsuccessfully in 0:00:00
[00:22:36] make: *** [Makefile:76: prepare] Error 101
[00:22:36] Command failed. Attempt 4/5:
[00:22:36]  Downloading filetime v0.1.10
[00:22:37] error: unable to get packages from source
[00:22:37] 
[00:22:37] To learn more, run the command again with --verbose.
[00:22:37] Build completed unsuccessfully in 0:00:00
[00:22:37] make: *** [Makefile:76: prepare] Error 101
[00:22:37] Command failed. Attempt 5/5:
[00:22:37]  Downloading num_cpus v1.4.0
[00:22:37] error: unable to get packages from source
[00:22:37] 
[00:22:37] To learn more, run the command again with --verbose.
[00:22:37] Build completed unsuccessfully in 0:00:00
[00:22:37] make: *** [Makefile:76: prepare] Error 101
[00:22:37] The command has failed after 5 attempts.
[00:22:37] Command exited with code 1

@alexcrichton
Copy link
Member

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 19, 2017
Number of filtered out tests in tests summary

Closes rust-lang#31905
bors added a commit that referenced this pull request May 19, 2017
@bors bors merged commit e6cde9f into rust-lang:master May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants