Skip to content

configure: have --enable-debug set -C debug-assertions=on so debug!() works again#23257

Merged
bors merged 2 commits intorust-lang:masterfrom
codyps:fix-debug
Mar 12, 2015
Merged

configure: have --enable-debug set -C debug-assertions=on so debug!() works again#23257
bors merged 2 commits intorust-lang:masterfrom
codyps:fix-debug

Conversation

@codyps
Copy link
Contributor

@codyps codyps commented Mar 10, 2015

configure: have --enable-debug set -C debug-assertions=on so debug!() works again

@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 10, 2015

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@emberian
Copy link
Contributor

emberian commented Mar 10, 2015

@bors r+ fbc10c3 rollup

@Manishearth
Copy link
Member

Manishearth commented Mar 11, 2015

This might be breaking tests

I get the following error in the rollup:

command: x86_64-unknown-linux-gnu/stage1/bin/rustc /opt/rust/src/test/run-pass/regions-nullary-variant.rs -L x86_64-unknown-linux-gnu/test/run-pass/ --target=x86_64-unknown-linux-gnu -L x86_64-unknown-linux-gnu/test/run-pass/regions-nullary-variant.stage1-x86_64-unknown-linux-gnulibaux -C prefer-dynamic -o x86_64-unknown-linux-gnu/test/run-pass/regions-nullary-variant.stage1-x86_64-unknown-linux-gnu --cfg rtopt --cfg debug =on -O -L x86_64-unknown-linux-gnu/rt
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
error: multiple input filenames provided

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

Note the -cfg debug =on, this seems to be happening for all of the rpass tests. Could you run make check-stage1-rpass and see if it's your PR causing the issue?

@pnkfelix
Copy link
Contributor

pnkfelix commented Mar 11, 2015

Yes, it is colliding with the logic in this line:
https://github.com/jmesmon/rust/blob/fix-debug/mk/tests.mk#L593

CTEST_RUSTC_FLAGS := $$(subst -C debug-assertions,,$$(CFG_RUSTC_FLAGS))

@pnkfelix
Copy link
Contributor

pnkfelix commented Mar 11, 2015

(an easy hack fix would be to put in two subst invocations there; the inner one would replace all -C debug-assertions=on with the empty string, and then the outer one would be the one we currently do.)

@pnkfelix pnkfelix mentioned this pull request Mar 11, 2015
Closed
@codyps
Copy link
Contributor Author

codyps commented Mar 11, 2015

I've added a commit that does the quick hack @pnkfelix suggested.
Actually removing all the possible variants of debug-assertions probably requires the use of $(shell sed ...) in some form.

@alexcrichton
Copy link
Member

alexcrichton commented Mar 12, 2015

@bors: r+ 100e1a9

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 12, 2015
@Manishearth
Rollup merge of rust-lang#23257 - jmesmon:fix-debug, r=alexcrichton
34d87b2 
 configure: have --enable-debug set -C debug-assertions=on so `debug!()` works again
@bors bors merged commit 100e1a9 into rust-lang:master Mar 12, 2015
@codyps codyps deleted the fix-debug branch March 12, 2015 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@codyps @rust-highfive @emberian @Manishearth @pnkfelix @alexcrichton @bors