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

Clean up jobserver integration #59804

Merged
merged 1 commit into from
Apr 14, 2019
Merged

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Apr 8, 2019

@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 Apr 8, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 8, 2019

@bors try

@bors
Copy link
Contributor

bors commented Apr 8, 2019

⌛ Trying commit c34f3dcfe426dc5bae9176ffbb03b940fd9a51cc with merge 29efa193a1a6b5480ece517b29cc2a2ad035aa25...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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.
travis_time:end:27a467f2:start=1554749311199409299,finish=1554749313407358025,duration=2207948726
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:12:49] 
[01:12:49] running 9 tests
[01:12:49] iiiiiiiii
[01:12:49] 
[01:12:49]  finished in 0.152
[01:12:49] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:13:05] 
[01:13:05] running 121 tests
[01:13:30] .iiiii...i.....i..i...i..i.i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i. 100/121
[01:13:34] i.i......iii.i.....ii
[01:13:34] 
[01:13:34]  finished in 29.723
[01:13:34] travis_fold:end:test_debuginfo

---
[01:39:18] failures:
[01:39:18] 
[01:39:18] ---- /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0038::The_trait_cannot_contain_associated_constants (line 975) stdout ----
[01:39:18] thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
[01:39:18]   left: `ThreadId(560)`,
[01:39:18]  right: `ThreadId(559)`', src/librustc_data_structures/sync.rs:707:9
[01:39:18] thread '/checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0038::The_trait_cannot_contain_associated_constants (line 975)' panicked at 'Some expected error codes were not found: ["E0038"]', src/librustdoc/test.rs:315:9
[01:39:18] 
[01:39:18] failures:
[01:39:18]     /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0038::The_trait_cannot_contain_associated_constants (line 975)
[01:39:18] 
---
[01:39:18] 
[01:39:18] 
[01:39:18] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:39:18] Build completed unsuccessfully in 0:38:16
[01:39:18] make: *** [check] Error 1
[01:39:18] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2c93c930
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Mon Apr  8 20:28:01 UTC 2019

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)

@bors
Copy link
Contributor

bors commented Apr 8, 2019

☀️ Try build successful - checks-travis
Build commit: 29efa193a1a6b5480ece517b29cc2a2ad035aa25

@alexcrichton
Copy link
Member

r=me when you're satisfied with the testing, definitely much cleaner now!

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

@rust-timer build 29efa193a1a6b5480ece517b29cc2a2ad035aa25

@rust-timer
Copy link
Collaborator

Success: Queued 29efa193a1a6b5480ece517b29cc2a2ad035aa25 with parent 3750348, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 29efa193a1a6b5480ece517b29cc2a2ad035aa25

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Apr 9, 2019

📋 Looks like this PR is still in progress, ignoring approval.

Hint: Remove [WIP] from this PR's title when it is ready for review.

@Zoxc Zoxc changed the title [WIP] Clean up jobserver integration Clean up jobserver integration Apr 9, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Apr 9, 2019

📌 Commit 03727a4 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 Apr 9, 2019
@killercup
Copy link
Member

@Zoxc wow, the perf diff in #59804 (comment) looks… disconcerting. I assume this is an issue with the measurement system?

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

@killercup No they look good. It fixes the regression seen previously here.

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

The effect of this PR being approximately this.

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 12, 2019

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Apr 12, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
Rollup of 18 pull requests

Successful merges:

 - rust-lang#59612 (Use normal newtype_index macro for MIR dataflows)
 - rust-lang#59675 (Stabilize the `alloc` crate.)
 - rust-lang#59708 (Mark variables captured by reference as mutable correctly)
 - rust-lang#59735 (remove lookup_char_pos_adj)
 - rust-lang#59747 (Copy book.toml unstable book generator)
 - rust-lang#59796 (Retire `IsNotConst` naming)
 - rust-lang#59804 (Clean up jobserver integration)
 - rust-lang#59818 (Eliminate `FnBox` usages from libstd.)
 - rust-lang#59830 (Fix links on keyword docs.)
 - rust-lang#59835 (Re-export NonZero signed variant in std)
 - rust-lang#59852 (std: Add `{read,write}_vectored` for more types)
 - rust-lang#59855 (Fix attributes position in type declaration)
 - rust-lang#59858 (Make duplicate matcher bindings a hard error)
 - rust-lang#59879 (Use SecRandomCopyBytes instead of /dev/urandom on MacOS)
 - rust-lang#59899 (In `-Zprint-type-size` output, sort enum variants by size.)
 - rust-lang#59912 (MaybeUninit: remove deprecated functions)
 - rust-lang#59925 (Fix paste error in split_ascii_whitespace docs.)
 - rust-lang#59930 (Exclude some copies of old book editions from search engines)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Apr 13, 2019
Rollup of 18 pull requests

Successful merges:

 - #59612 (Use normal newtype_index macro for MIR dataflows)
 - #59675 (Stabilize the `alloc` crate.)
 - #59708 (Mark variables captured by reference as mutable correctly)
 - #59735 (remove lookup_char_pos_adj)
 - #59747 (Copy book.toml unstable book generator)
 - #59796 (Retire `IsNotConst` naming)
 - #59804 (Clean up jobserver integration)
 - #59818 (Eliminate `FnBox` usages from libstd.)
 - #59830 (Fix links on keyword docs.)
 - #59835 (Re-export NonZero signed variant in std)
 - #59852 (std: Add `{read,write}_vectored` for more types)
 - #59855 (Fix attributes position in type declaration)
 - #59858 (Make duplicate matcher bindings a hard error)
 - #59879 (Use SecRandomCopyBytes instead of /dev/urandom on MacOS)
 - #59899 (In `-Zprint-type-size` output, sort enum variants by size.)
 - #59912 (MaybeUninit: remove deprecated functions)
 - #59925 (Fix paste error in split_ascii_whitespace docs.)
 - #59930 (Exclude some copies of old book editions from search engines)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Apr 13, 2019

@bors rollup-

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 13, 2019

Any reason for not rolling this up?

@Centril
Copy link
Contributor

Centril commented Apr 13, 2019

@Zoxc I was going to r- this as the cause of failure in #59937 (comment) but wasn't sure.

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 13, 2019

Seems unlikely to me.

Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
bors added a commit that referenced this pull request Apr 13, 2019
Rollup of 16 pull requests

Successful merges:

 - #59675 (Stabilize the `alloc` crate.)
 - #59708 (Mark variables captured by reference as mutable correctly)
 - #59735 (remove lookup_char_pos_adj)
 - #59747 (Copy book.toml unstable book generator)
 - #59796 (Retire `IsNotConst` naming)
 - #59804 (Clean up jobserver integration)
 - #59818 (Eliminate `FnBox` usages from libstd.)
 - #59830 (Fix links on keyword docs.)
 - #59835 (Re-export NonZero signed variant in std)
 - #59852 (std: Add `{read,write}_vectored` for more types)
 - #59855 (Fix attributes position in type declaration)
 - #59858 (Make duplicate matcher bindings a hard error)
 - #59899 (In `-Zprint-type-size` output, sort enum variants by size.)
 - #59912 (MaybeUninit: remove deprecated functions)
 - #59925 (Fix paste error in split_ascii_whitespace docs.)
 - #59930 (Exclude some copies of old book editions from search engines)

Failed merges:

r? @ghost
@bors bors merged commit 03727a4 into rust-lang:master Apr 14, 2019
@Zoxc Zoxc deleted the cleaner-jobserver branch April 14, 2019 05:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants