itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #180 : sfackler/cargo/ndebug, r=wycats

Browse Source 
This will disable debug!() and debug_assert!() statements.
This commit is contained in:
bors 2014-07-13 05:44:50 +00:00
commit 2f60ba328b
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cargo/ops/cargo_rustc/mod.rs
View File

@ -255,6 +255,11 @@ fn build_base_args(into: &mut Args,
// into.push("-g".to_string());
// }
if !profile.get_debug() {
into.push("--cfg".to_string());
into.push("ndebug".to_string());
}
if profile.is_test() {
into.push("--test".to_string());
}

38
tests/test_cargo_compile.rs
View File

@ -1030,6 +1030,7 @@ test!(verbose_release_build {
assert_eq!(out, format!("\
{} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
--opt-level 3 \
--cfg ndebug \
-C metadata=test:-:0.0.0:-:file:{dir} \
-C extra-filename={hash} \
--out-dir {dir}{sep}target{sep}release \
@ -1075,6 +1076,7 @@ test!(verbose_release_build_deps {
{running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
--crate-type lib \
--opt-level 3 \
--cfg ndebug \
-C metadata=foo:-:0.0.0:-:file:{dir} \
-C extra-filename={hash1} \
--out-dir {dir}{sep}target{sep}release{sep}deps \
@ -1082,6 +1084,7 @@ test!(verbose_release_build_deps {
-L {dir}{sep}target{sep}release{sep}deps`
{running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
--opt-level 3 \
--cfg ndebug \
-C metadata=test:-:0.0.0:-:file:{dir} \
-C extra-filename={hash2} \
--out-dir {dir}{sep}target{sep}release \
@ -1163,3 +1166,38 @@ test!(implicit_examples {
assert_that(process(p.bin("test/hello")), execs().with_stdout("Hello, World!\n"));
assert_that(process(p.bin("test/goodbye")), execs().with_stdout("Goodbye, World!\n"));
})
test!(standard_build_no_ndebug {
let p = project("world")
.file("Cargo.toml", basic_bin_manifest("foo"))
.file("src/foo.rs", r#"
fn main() {
if cfg!(ndebug) {
println!("fast")
} else {
println!("slow")
}
}
"#);
assert_that(p.cargo_process("cargo-build"), execs().with_status(0));
assert_that(process(p.bin("foo")), execs().with_stdout("slow\n"));
})
test!(release_build_ndebug {
let p = project("world")
.file("Cargo.toml", basic_bin_manifest("foo"))
.file("src/foo.rs", r#"
fn main() {
if cfg!(ndebug) {
println!("fast")
} else {
println!("slow")
}
}
"#);
assert_that(p.cargo_process("cargo-build").arg("--release"),
execs().with_status(0));
assert_that(process(p.bin("release/foo")), execs().with_stdout("fast\n"));
})