port compiletest to use JSON output #33020

nikomatsakis · 2016-04-16T01:27:26Z

This uncovered a lot of bugs in compiletest and also some shortcomings
of our existing JSON output. We had to add information to the JSON
output, such as suggested text and macro backtraces. We also had to fix
various bugs in the existing tests.

Joint work with @jonathandturner.

r? @alexcrichton

nikomatsakis · 2016-04-16T10:27:21Z

OK, I think make check is passing locally now. I encountered a bunch of niggling errors towards the end of the cycle.

alexcrichton · 2016-04-16T22:41:46Z

src/compiletest/json.rs

+                        file_name: &str) {
+    // We only consider messages pertaining to the current file.
+    let matching_spans =
+        || diagnostic.spans.iter().filter(|span| span.file_name == file_name);


These are some... interesting choices of indentation?

Would you prefer this?

let matching_spans = || { diagnostic.spans.iter().filter(|span| span.file_name == file_name) };

Personally, yeah, but I'm mostly just randomly commenting :)

alexcrichton · 2016-04-16T22:51:09Z

Changes pretty much all look good to me, just a few minor nits here and there. I'm pretty scared about the style this is introducing but no need to block anything on that.

nikomatsakis · 2016-04-17T11:03:40Z

@alexcrichton

I'm pretty scared about the style this is introducing but no need to block anything on that.

Are you referring to the indentation, or something else?

alexcrichton · 2016-04-17T18:16:04Z

Are you referring to the indentation, or something else?

Yeah mostly how things are aligned to encourage rightward drift and how I have no idea how to configure an editor to automatically generate that style. That being said it's pretty minor.

Oh and meant to say, r=me, the only real change I'd like to see is TMPDIR removed as that's probably papering over something which should be fixed elsewhere, but otherwise seems fine.

nikomatsakis · 2016-04-18T09:06:56Z

@alexcrichton ok, I removed that TMPDIR change and I also tweaked the style a bit. :)

nikomatsakis · 2016-04-18T09:07:03Z

@bors r=alexcrichton

bors · 2016-04-18T09:07:03Z

📌 Commit aab0dd0 has been approved by alexcrichton

bors · 2016-04-18T09:07:05Z

⌛ Testing commit aab0dd0 with merge 090cf77...

bors · 2016-04-18T09:58:08Z

💔 Test failed - auto-win-gnu-32-opt-rustbuild

nikomatsakis · 2016-04-18T10:41:05Z

Linkcheck stage2 (i686-pc-windows-gnu)
panic_abort\fn.rust_eh_personality.html:50: broken link - src\panic_abort\lib.rs.html
panic_abort\fn.__rust_maybe_catch_panic.html:50: broken link - src\panic_abort\lib.rs.html
panic_abort\fn.__rust_start_panic.html:50: broken link - src\panic_abort\lib.rs.html
panic_abort\index.html:50: broken link - src\panic_abort\lib.rs.html
panic_unwind\fn.rust_eh_register_frames.html:50: broken link - src\panic_unwind\gcc\mod.rs.html
panic_unwind\fn.rust_eh_unregister_frames.html:50: broken link - src\panic_unwind\gcc\mod.rs.html
panic_unwind\fn.__rust_maybe_catch_panic.html:50: broken link - src\panic_unwind\lib.rs.html
panic_unwind\fn.__rust_start_panic.html:50: broken link - src\panic_unwind\lib.rs.html
panic_unwind\index.html:50: broken link - src\panic_unwind\lib.rs.html


command did not execute successfully: "C:\\bot\\slave\\auto-win-gnu-32-opt-rustbuild\\build\\obj\\build\\i686-pc-windows-gnu\\stage2-rustc\\i686-pc-windows-gnu\\release\\linkchecker.exe" "C:\\bot\\slave\\auto-win-gnu-32-opt-rustbuild\\build\\obj\\build\\i686-pc-windows-gnu\\doc"
expected success, got: exit code: 101


Makefile:40: recipe for target 'check' failed
Zombie process: "\Device\HarddiskVolume1\dojob.exe"
thread '<main>' panicked at 'found some broken links', C:\bot\slave\auto-win-gnu-32-opt-rustbuild\build\src\tools\linkchecker\main.rs:54
note: Run with `RUST_BACKTRACE=1` for a backtrace.
make: *** [check] Error 1

Hmm.

nikomatsakis · 2016-04-18T10:41:41Z

@bors retry

bors · 2016-04-18T10:41:43Z

⌛ Testing commit aab0dd0 with merge 4be56d7...

bors · 2016-04-18T11:31:40Z

💔 Test failed - auto-win-gnu-32-opt-rustbuild

alexcrichton · 2016-04-18T15:55:44Z

@bors: retry

On Mon, Apr 18, 2016 at 4:31 AM, bors [email protected] wrote:

[image: 💔] Test failed - auto-win-gnu-32-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt-rustbuild/builds/759

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#33020 (comment)

bors · 2016-04-19T04:12:52Z

☔ The latest upstream changes (presumably #32755) made this pull request unmergeable. Please resolve the merge conflicts.

nikomatsakis · 2016-04-19T15:13:05Z

@bors r=acrichto

bors · 2016-04-19T15:13:06Z

📌 Commit 949a5ef has been approved by acrichto

bors · 2016-04-21T11:43:04Z

⌛ Testing commit 399149a with merge a653136...

bors · 2016-04-21T12:49:15Z

💔 Test failed - auto-win-msvc-64-opt-rustbuild

nikomatsakis · 2016-04-21T14:28:22Z

um. something is definitely messed up there...

alexcrichton · 2016-04-22T00:44:07Z

src/tools/compiletest/src/json.rs

+                        file_name: &str) {
+    // We only consider messages pertaining to the current file.
+    let matching_spans = || {
+        diagnostic.spans.iter().filter(|span| span.file_name == file_name)


I think file_name has backslashes normalized away, but span.file_name does not, so on Windows this match never fires.

(discovered with @jonathandturner in person and he's working on a fix)

As a small note, using Path here may help as that equality takes path normalization (like / vs \) into account.

nikomatsakis · 2016-04-22T09:06:14Z

@bors r=acrichto

bors · 2016-04-22T09:06:15Z

📌 Commit fd0632f has been approved by acrichto

bors · 2016-04-22T09:44:48Z

⌛ Testing commit fd0632f with merge 0d6abb5...

bors · 2016-04-22T10:41:28Z

💔 Test failed - auto-win-gnu-32-opt-rustbuild

alexcrichton · 2016-04-22T16:13:40Z

@bors: retry

On Fri, Apr 22, 2016 at 3:41 AM, bors [email protected] wrote:

[image: 💔] Test failed - auto-win-gnu-32-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt-rustbuild/builds/804

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#33020 (comment)

alexcrichton · 2016-04-22T16:23:42Z

@bors: r-

oh wait this one was legit

sophiajt · 2016-04-22T16:34:43Z

@bors r=alexcrichton

bors · 2016-04-22T16:34:44Z

📌 Commit 10d4cda has been approved by alexcrichton

@alexcrichton

…excrichton port compiletest to use JSON output This uncovered a lot of bugs in compiletest and also some shortcomings of our existing JSON output. We had to add information to the JSON output, such as suggested text and macro backtraces. We also had to fix various bugs in the existing tests. Joint work with @jonathandturner. r? @alexcrichton

bors · 2016-04-23T04:47:54Z

⌛ Testing commit 10d4cda with merge bb4b0d8...

@alexcrichton

port compiletest to use JSON output This uncovered a lot of bugs in compiletest and also some shortcomings of our existing JSON output. We had to add information to the JSON output, such as suggested text and macro backtraces. We also had to fix various bugs in the existing tests. Joint work with @jonathandturner. r? @alexcrichton

bors · 2016-04-23T07:22:15Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

nikomatsakis · 2016-04-23T12:35:34Z

Huzzah! :)

rust-highfive assigned alexcrichton Apr 16, 2016

nikomatsakis force-pushed the compiletest-json branch 2 times, most recently from 8ed6452 to 492826c Compare April 16, 2016 10:26

nikomatsakis force-pushed the compiletest-json branch from 492826c to 2a749a8 Compare April 16, 2016 11:43

alexcrichton reviewed Apr 16, 2016
View reviewed changes

nikomatsakis force-pushed the compiletest-json branch from 2a749a8 to aab0dd0 Compare April 18, 2016 09:05

nikomatsakis force-pushed the compiletest-json branch from aab0dd0 to 949a5ef Compare April 19, 2016 15:12

alexcrichton reviewed Apr 22, 2016
View reviewed changes

Fix for filepath for cfail tests in windows

fd0632f

Merge remote-tracking branch 'rust-lang/master' into compiletest-json

d81de48

Fix filepath check for macro backtrace

10d4cda

Manishearth mentioned this pull request Apr 22, 2016

Rollup of 6 pull requests #33154

Closed

bors merged commit 10d4cda into rust-lang:master Apr 23, 2016

bors mentioned this pull request Apr 23, 2016

test: Move run-make tests into compiletest #33093

Merged

petrochenkov mentioned this pull request Apr 24, 2016

Batch up breaking libsyntax changes #33179

Merged

matklad mentioned this pull request Apr 26, 2016

Improve chain call formatting intellij-rust/intellij-rust#355

Closed

sanxiyn mentioned this pull request May 23, 2016

JSON errors with suggestions are incomplete #30701

Closed

nikomatsakis deleted the compiletest-json branch October 3, 2016 14:55

port compiletest to use JSON output #33020

port compiletest to use JSON output #33020

Conversation

nikomatsakis commented Apr 16, 2016 • edited by sanxiyn Loading

nikomatsakis commented Apr 16, 2016

alexcrichton Apr 16, 2016

Choose a reason for hiding this comment

nikomatsakis Apr 17, 2016

Choose a reason for hiding this comment

alexcrichton Apr 17, 2016

Choose a reason for hiding this comment

alexcrichton commented Apr 16, 2016

nikomatsakis commented Apr 17, 2016

alexcrichton commented Apr 17, 2016

nikomatsakis commented Apr 18, 2016

nikomatsakis commented Apr 18, 2016

bors commented Apr 18, 2016

bors commented Apr 18, 2016

bors commented Apr 18, 2016

nikomatsakis commented Apr 18, 2016

nikomatsakis commented Apr 18, 2016

bors commented Apr 18, 2016

bors commented Apr 18, 2016

alexcrichton commented Apr 18, 2016

bors commented Apr 19, 2016

nikomatsakis commented Apr 19, 2016

bors commented Apr 19, 2016

bors commented Apr 21, 2016

bors commented Apr 21, 2016

nikomatsakis commented Apr 21, 2016

alexcrichton Apr 22, 2016

Choose a reason for hiding this comment

nikomatsakis commented Apr 22, 2016

bors commented Apr 22, 2016

bors commented Apr 22, 2016

bors commented Apr 22, 2016

alexcrichton commented Apr 22, 2016

alexcrichton commented Apr 22, 2016

sophiajt commented Apr 22, 2016

bors commented Apr 22, 2016

bors commented Apr 23, 2016

bors commented Apr 23, 2016

nikomatsakis commented Apr 23, 2016 • edited Loading

nikomatsakis commented Apr 16, 2016 •

edited by sanxiyn

Loading

nikomatsakis commented Apr 23, 2016 •

edited

Loading