Skip to content

Trace macros flag #24430

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
Merged
merged 6 commits into from
Apr 17, 2015
Merged

Trace macros flag #24430

merged 6 commits into from
Apr 17, 2015

Conversation

laumann
Copy link
Contributor

@laumann laumann commented Apr 14, 2015

This is the second attempt at turning the trace_macros macro into a compiler flag.

See #22619

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (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. 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 CONTRIBUTING.md for more information.

laumann
laumann reviewed Apr 14, 2015
View reviewed changes
src/librustc_driver/driver.rs
@@ -482,6 +482,7 @@ pub fn phase_2_configure_and_expand(sess: &Session,
crate_name: crate_name.to_string(),
features: Some(&features),
recursion_limit: sess.recursion_limit.get(),
trace_mac: sess.opt.debugging_opts.trace_macros,
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 should be sess.opts - I don't understand how Travis can mark this as OK

Thomas Jespersen added 2 commits April 14, 2015 22:18
Fix: sess.opt should have been sess.opts
35b49fe
Remove -o flag from build command
5e1505f 
It generates a warning that --outdir argument is ignored, which is
captured and spoils the output

Also ensure that test output is captured in a different file than the
expected output file
@pnkfelix
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 15, 2015

📌 Commit 5e1505f has been approved by pnkfelix

@bors
Copy link
Collaborator

bors commented Apr 15, 2015

⌛ Testing commit 5e1505f with merge b96e46d...

@bors
Copy link
Collaborator

bors commented Apr 15, 2015

💔 Test failed - auto-linux-64-nopt-t

@laumann
Copy link
Contributor Author

laumann commented Apr 15, 2015

@pnkfelix Is there something wrong with the way I defined the test?

@pnkfelix
Copy link
Member

@laumann did you run the maketest locally? (I assumed you must have done so, but I figured I'll ask now.)

@laumann
Copy link
Contributor Author

laumann commented Apr 15, 2015

I ran make check-stage1, but that's maybe not enough?

@laumann
Copy link
Contributor Author

laumann commented Apr 15, 2015

@pnkfelix Seems to work now... I ran make check locally (successfully) before pushing the last commit

@Manishearth
Copy link
Member

@bors r=pnkfelix

@bors
Copy link
Collaborator

bors commented Apr 15, 2015

📌 Commit 3a20363 has been approved by pnkfelix

@bors
Copy link
Collaborator

bors commented Apr 16, 2015

⌛ Testing commit 3a20363 with merge d81e89e...

@bors
Copy link
Collaborator

bors commented Apr 16, 2015

💔 Test failed - auto-linux-64-nopt-t

@Manishearth
Copy link
Member 

maketest: trace-macros-flag
----- /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/test/run-make/trace-macros-flag/ --------------------
------ stdout ---------------------------------------------
make[1]: Entering directory `/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/test/run-make/trace-macros-flag'
LD_LIBRARY_PATH="/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag:/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/stage2/lib:/home/rustbuild/gcc-4.7.4/lib64:/home/rustbuild/gcc-4.7.4/lib" /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/stage2/bin/rustc --out-dir /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag -L /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag -Z trace-macros hello.rs &> /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag/hello.out
diff -u /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag/hello.out hello.trace
--- /home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/obj/x86_64-unknown-linux-gnu/test/run-make/trace-macros-flag/hello.out  2015-04-16 11:27:50.638159976 +0000
+++ hello.trace 2015-04-16 10:35:56.314159976 +0000
@@ -0,0 +1,2 @@
+println! { "Hello, World!" }
+print! { concat ! ( "Hello, World!" , "\n" ) }
make[1]: Leaving directory `/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/test/run-make/trace-macros-flag'
println! { "Hello, World!" }
print! { concat ! ( "Hello, World!" , "\n" ) }

------ stderr ---------------------------------------------
make[1]: *** [all] Error 1

Remove & from redirected output
c0139ca 
This seems to fix the test
@pnkfelix
Copy link
Member

@bors r+ c0139ca

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 17, 2015
@Manishearth
Rollup merge of rust-lang#24430 - laumann:trace-macros-flag, r=pnkfelix
228987c 
 This is the second attempt at turning the trace_macros macro into a compiler flag.

See rust-lang#22619
Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 17, 2015
@Manishearth
Rollup merge of rust-lang#24430 - laumann:trace-macros-flag, r=pnkfelix
3734636 
 This is the second attempt at turning the trace_macros macro into a compiler flag.

See rust-lang#22619
@bors
Copy link
Collaborator

bors commented Apr 17, 2015

⌛ Testing commit c0139ca with merge a369eec...

@bors
Copy link
Collaborator

bors commented Apr 17, 2015

💔 Test failed - auto-mac-64-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

On Fri, Apr 17, 2015 at 7:59 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-64-nopt-t
http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4566

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

@bors bors merged commit c0139ca into rust-lang:master Apr 17, 2015
@laumann laumann deleted the trace-macros-flag branch April 18, 2015 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@laumann @rust-highfive @pnkfelix @bors @Manishearth @alexcrichton