Fix quote tests #24718

tamird · 2015-04-23T06:20:46Z

Sniped from @rprichard's work in #24537. r? @alexcrichton

alexcrichton · 2015-04-23T15:43:17Z

src/test/parse-fail/qquote-1.rs


-#![feature(quote)]
+#![feature(quote, rustc_private)]

 extern crate syntax;


I agree with @rprichard that these tests which link to syntax should be in compile-fail-fulldeps to ensure that the dependencies work out correctly during builds.

alexcrichton · 2015-04-23T15:43:28Z

Thanks!

tamird · 2015-04-23T15:50:05Z

src/test/parse-fail/qquote-2.rs


-fn check_pp<T>(expr: T, f: |pprust::ps, T|, expect: str) {
-    panic!();
+    quote_expr!(&cx, let x isize = 20;).and_then(|expr| { //~ ERROR expected end-of-string


@alexcrichton do you have any thoughts on how this can be made to fail in the expected way? it currently compiles without issue and then crashes at runtime

Unfortunately I know very little about the quasiquoter so I'm not sure :(

tamird · 2015-04-23T16:36:58Z

OK, I think this should be good to merge after #24537 goes in.

alexcrichton · 2015-04-23T17:05:22Z

@bors: r+ a8b2382

(hopefully bors will order these right)

tamird · 2015-04-23T17:11:13Z

Apparently it won't, because @rprichard's branch is marked rollup.
On Apr 23, 2015 10:05 AM, "Alex Crichton" notifications@github.com wrote:

@bors https://github.com/bors: r+ a8b2382
a8b2382

(hopefully bors will order these right)

—
Reply to this email directly or view it on GitHub
#24718 (comment).

alexcrichton · 2015-04-23T17:12:23Z

@bors: rollup

muahahaha

@rprichard

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

- Successful merges: #24523, #24698, #24699, #24700, #24706, #24717, #24718, #24721, #24727 - Failed merges:

Manishearth · 2015-04-24T13:51:22Z

This fails, but 874e093 might fix it. Please check locally.

tamird · 2015-04-24T14:24:50Z

not quite - run-fail/qquote.rs was missing backticks around 'abcd' in the expected error

alexcrichton · 2015-04-24T16:55:16Z

@bors: r= 1cc7b51

alexcrichton · 2015-04-24T16:55:21Z

@bors: r+ 1cc7b51

@rprichard

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

@rprichard

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

steveklabnik · 2015-04-25T02:54:04Z

yeah, this caused the rollup to fail http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4686/steps/test/logs/stdio

steveklabnik · 2015-04-25T02:54:08Z

@bors: r-

Re-enables the test.

tamird · 2015-04-25T21:41:16Z

Ugh, the expected error message had a superfluous colon. Should be good now.

tamird · 2015-04-25T23:03:44Z

This passes locally now!

steveklabnik · 2015-04-25T23:04:39Z

@bors: r=alexcrichton

bors · 2015-04-25T23:04:40Z

📌 Commit beb373b has been approved by alexcrichton

rprichard · 2015-04-25T23:20:05Z

I feel we should leave the test disabled until we've figured out a way to enable it that doesn't have missing dependencies. Presumably this change will break parallel make check.

tamird · 2015-04-25T23:28:30Z

@rprichard I'm trying to induce this failure: make -j20 check-stage1-rfail. In the meantime, would you mind putting up a commit I could look at that adds rfail-full?

rprichard · 2015-04-25T23:39:13Z

Sure, I'll take a stab at it.

bors · 2015-04-25T23:40:11Z

⌛ Testing commit beb373b with merge da62384...

@rprichard

Sniped from @rprichard's work in #24537. r? @alexcrichton

rprichard · 2015-04-26T00:26:30Z

Here's a commit adding rfail-full. rprichard@55e8d5e. I haven't moved the quote test over, though I probably should. Then, I can get rid of src/tests/run-fail-fulldeps/.gitkeep and not worry about what an empty test directory does. I'm doing some testing with it.

I was able to reproduce a failure with make -j10 check-stage1

failures:

---- [run-fail] run-fail/qquote.rs stdout ----

error: compilation failed!
status: exit code: 101
command: x86_64-unknown-linux-gnu/stage1/bin/rustc /home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs -L x86_64-unknown-linux-gnu/test/run-fail/ --target=x86_64-unknown-linux-gnu -L x86_64-unknown-linux-gnu/test/run-fail/qquote.stage1-x86_64-unknown-linux-gnu.run-fail.libaux -C prefer-dynamic -o x86_64-unknown-linux-gnu/test/run-fail/qquote.stage1-x86_64-unknown-linux-gnu --cfg rtopt --cfg ndebug -C rpath -O -L x86_64-unknown-linux-gnu/rt
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
/home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs:17:1: 17:21 error: can't find crate for `syntax`
/home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs:17 extern crate syntax;
                                                                  ^~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error

------------------------------------------

thread '[run-fail] run-fail/qquote.rs' panicked at 'explicit panic', /home/rprichard/work/rust-staging2/src/compiletest/runtest.rs:1512



failures:
    [run-fail] run-fail/qquote.rs

test result: FAILED. 97 passed; 1 failed; 5 ignored; 0 measured

thread '<main>' panicked at 'Some tests failed', /home/rprichard/work/rust-staging2/src/compiletest/compiletest.rs:256
make: *** [tmp/check-stage1-T-x86_64-unknown-linux-gnu-H-x86_64-unknown-linux-gnu-rfail.ok] Error 101
make: *** Waiting for unfinished jobs....

tamird · 2015-04-26T00:48:10Z

Nice, thanks! Since this PR is already building, do you think we could
address this in a follow-up PR? You could then include the reordering
mentioned in your commit in a separate commit.
On Apr 25, 2015 5:26 PM, "Ryan Prichard" notifications@github.com wrote:

Here's a commit adding rfail-full. rprichard/rust@55e8d5e
rprichard@55e8d5e.
I haven't moved the quote test over, though I probably should. Then, I can
get rid of src/tests/run-fail-fulldeps/.gitkeep and not worry about what
an empty test directory does. I'm doing some testing with it.

I was able to reproduce a failure with make -j10 check-stage1

failures:

---- [run-fail] run-fail/qquote.rs stdout ----

error: compilation failed!
status: exit code: 101
command: x86_64-unknown-linux-gnu/stage1/bin/rustc /home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs -L x86_64-unknown-linux-gnu/test/run-fail/ --target=x86_64-unknown-linux-gnu -L x86_64-unknown-linux-gnu/test/run-fail/qquote.stage1-x86_64-unknown-linux-gnu.run-fail.libaux -C prefer-dynamic -o x86_64-unknown-linux-gnu/test/run-fail/qquote.stage1-x86_64-unknown-linux-gnu --cfg rtopt --cfg ndebug -C rpath -O -L x86_64-unknown-linux-gnu/rt

stdout:

stderr:

/home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs:17:1: 17:21 error: can't find crate for syntax
/home/rprichard/work/rust-staging2/src/test/run-fail/qquote.rs:17 extern crate syntax;
^~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error

thread '[run-fail] run-fail/qquote.rs' panicked at 'explicit panic', /home/rprichard/work/rust-staging2/src/compiletest/runtest.rs:1512

failures:
[run-fail] run-fail/qquote.rs

test result: FAILED. 97 passed; 1 failed; 5 ignored; 0 measured

thread '
' panicked at 'Some tests failed', /home/rprichard/work/rust-staging2/src/compiletest/compiletest.rs:256
make: *** [tmp/check-stage1-T-x86_64-unknown-linux-gnu-H-x86_64-unknown-linux-gnu-rfail.ok] Error 101
make: *** Waiting for unfinished jobs....

—
Reply to this email directly or view it on GitHub
#24718 (comment).

rprichard · 2015-04-26T01:10:32Z

I could go either way. We might want to avoid having a span of time where make check-stage1 is unreliable on master, so my inclination would be to cherry-pick my commit into this PR. I can submit a later PR reordering the tests, if it seems worth it. I'm not sure, but I think it's possible that check-stage1 could fail in practice, even without parallelism, because I think make rustc-stage1 doesn't build the rustc lib crates, and I think the rfail test might run before any fulldeps tests.

I verified that make -j10 check-stage1-rfail-full passes with that commit, BTW. As I guessed, it succeeds and runs zero tests. If I remove the .gitkeep file (and therefore the src/tests/run-fail-fulldeps directory), the tests fail with:

thread '<main>' panicked at 'called `Result::unwrap()` on an `Err` value: Error { repr: Os(2) }', /home/rprichard/work/rust-staging3/src/libcore/result.rs:729
make: *** [tmp/check-stage1-T-x86_64-unknown-linux-gnu-H-x86_64-unknown-linux-gnu-rfail-full.ok] Error 101

rprichard · 2015-04-26T01:37:29Z

In any case, I removed my .gitkeep file and moved qquote. It's on this branch: master...rprichard:fix-quote-tests. I'm running some tests on it to verify that it works.

bors · 2015-04-26T01:37:56Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

tamird · 2015-04-26T02:22:58Z

@rprichard mind opening that PR or do you want me to?

rprichard · 2015-04-26T03:17:44Z

I'll open the PR. I verified that make -j6 rustc-stage1 && make check-stage1 fail with a missing syntax crate with this PR, so I'll get a PR ready within a few hours. My fixed version also failed, on the run-fail-fulldeps/qquote.rs test, apparently because it's trying to access some path that doesn't exist.

rprichard · 2015-04-26T03:59:32Z

I needed to add a line to configure. I'll see if that fixes things.

@tamird

This commit gets `make check-stage1` working again after #24718. cc @tamird r? @alexcrichton

rust-highfive assigned alexcrichton Apr 23, 2015

tamird force-pushed the fix-quote-tests branch from d51df3d to a42d8e8 Compare April 23, 2015 06:23

alexcrichton reviewed Apr 23, 2015
View reviewed changes

tamird reviewed Apr 23, 2015
View reviewed changes

tamird force-pushed the fix-quote-tests branch 3 times, most recently from 8ac3341 to a8b2382 Compare April 23, 2015 16:34

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 24, 2015

Rollup merge of rust-lang#24718 - tamird:fix-quote-tests, r=alexcrichton

e3c35d6

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

Manishearth mentioned this pull request Apr 24, 2015

Rollup of 9 pull requests #24758

Merged

bors added a commit that referenced this pull request Apr 24, 2015

Auto merge of #24758 - Manishearth:rollup, r=Manishearth

2efcd0b

- Successful merges: #24523, #24698, #24699, #24700, #24706, #24717, #24718, #24721, #24727 - Failed merges:

bors added a commit that referenced this pull request Apr 24, 2015

Auto merge of #24758 - Manishearth:rollup, r=Manishearth

f191f92

- Successful merges: #24523, #24698, #24699, #24700, #24706, #24717, #24718, #24721, #24727 - Failed merges:

tamird force-pushed the fix-quote-tests branch from a8b2382 to b6338de Compare April 24, 2015 14:23

tamird force-pushed the fix-quote-tests branch from b6338de to 1cc7b51 Compare April 24, 2015 16:51

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 24, 2015

Rollup merge of rust-lang#24718 - tamird:fix-quote-tests, r=alexcrichton

e183df0

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

steveklabnik mentioned this pull request Apr 24, 2015

Rollup of 8 pull requests #24784

Closed

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 24, 2015

Rollup merge of rust-lang#24718 - tamird:fix-quote-tests, r=alexcrichton

da7d86e

Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton

steveklabnik mentioned this pull request Apr 24, 2015

Rollup of 7 pull requests #24786

Closed

tamird added 4 commits April 25, 2015 14:14

Unrot and re-enable run-pass-fulldeps/qquote.rs

8ab8619

Re-enable test

597efd6

qquote-1.rs -> compile-fail-fulldeps/qquote.rs

00cb5c4

Re-enables the test.

qquote-2.rs -> run-fail/qquote.rs

beb373b

Re-enables the test.

tamird force-pushed the fix-quote-tests branch from 1cc7b51 to beb373b Compare April 25, 2015 21:40

bors added a commit that referenced this pull request Apr 25, 2015

Auto merge of #24718 - tamird:fix-quote-tests, r=alexcrichton

da62384

Sniped from @rprichard's work in #24537. r? @alexcrichton

bors merged commit beb373b into rust-lang:master Apr 26, 2015

bors mentioned this pull request Apr 26, 2015

Interpolate AST nodes in quasiquote. #23085

Merged

tamird deleted the fix-quote-tests branch April 26, 2015 02:21

rprichard mentioned this pull request Apr 26, 2015

Add rfail-full test group for qquote.rs #24835

Merged

bors added a commit that referenced this pull request Apr 28, 2015

Auto merge of #24835 - rprichard:rfail-full, r=alexcrichton

da2276e

This commit gets `make check-stage1` working again after #24718. cc @tamird r? @alexcrichton

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix quote tests #24718

Fix quote tests #24718

tamird commented Apr 23, 2015

alexcrichton Apr 23, 2015

alexcrichton commented Apr 23, 2015

tamird Apr 23, 2015

alexcrichton Apr 23, 2015

tamird commented Apr 23, 2015

alexcrichton commented Apr 23, 2015

tamird commented Apr 23, 2015

alexcrichton commented Apr 23, 2015

Manishearth commented Apr 24, 2015

tamird commented Apr 24, 2015

alexcrichton commented Apr 24, 2015

alexcrichton commented Apr 24, 2015

steveklabnik commented Apr 25, 2015

steveklabnik commented Apr 25, 2015

tamird commented Apr 25, 2015

tamird commented Apr 25, 2015

steveklabnik commented Apr 25, 2015

bors commented Apr 25, 2015

rprichard commented Apr 25, 2015

tamird commented Apr 25, 2015

rprichard commented Apr 25, 2015

bors commented Apr 25, 2015

rprichard commented Apr 26, 2015

tamird commented Apr 26, 2015

stdout:

stderr:

rprichard commented Apr 26, 2015

rprichard commented Apr 26, 2015

bors commented Apr 26, 2015

tamird commented Apr 26, 2015

rprichard commented Apr 26, 2015

rprichard commented Apr 26, 2015

Fix quote tests #24718

Fix quote tests #24718

Conversation

tamird commented Apr 23, 2015

alexcrichton Apr 23, 2015

Choose a reason for hiding this comment

alexcrichton commented Apr 23, 2015

tamird Apr 23, 2015

Choose a reason for hiding this comment

alexcrichton Apr 23, 2015

Choose a reason for hiding this comment

tamird commented Apr 23, 2015

alexcrichton commented Apr 23, 2015

tamird commented Apr 23, 2015

alexcrichton commented Apr 23, 2015

Manishearth commented Apr 24, 2015

tamird commented Apr 24, 2015

alexcrichton commented Apr 24, 2015

alexcrichton commented Apr 24, 2015

steveklabnik commented Apr 25, 2015

steveklabnik commented Apr 25, 2015

tamird commented Apr 25, 2015

tamird commented Apr 25, 2015

steveklabnik commented Apr 25, 2015

bors commented Apr 25, 2015

rprichard commented Apr 25, 2015

tamird commented Apr 25, 2015

rprichard commented Apr 25, 2015

bors commented Apr 25, 2015

rprichard commented Apr 26, 2015

tamird commented Apr 26, 2015

stdout:

stderr:

rprichard commented Apr 26, 2015

rprichard commented Apr 26, 2015

bors commented Apr 26, 2015

tamird commented Apr 26, 2015

rprichard commented Apr 26, 2015

rprichard commented Apr 26, 2015