diff options
| author | bors <bors@rust-lang.org> | 2013-06-29 00:49:45 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-29 00:49:45 -0700 |
| commit | a229c980c8c8e628571008882bd7da71f2b3ef7a (patch) | |
| tree | 71e2fb3e4966c53fdbd091fe6bd51b401ba3f334 | |
| parent | 4e78c1e2a89f65a1827e1f65afc741cee05cee0a (diff) | |
| parent | 3dfbc5a9c49d65295bf96ce435a29df72e03c09e (diff) | |
| download | rust-a229c980c8c8e628571008882bd7da71f2b3ef7a.tar.gz rust-a229c980c8c8e628571008882bd7da71f2b3ef7a.zip | |
auto merge of #7439 : catamorphism/rust/cut-rustpkg-output, r=catamorphism
Closes #7250
| -rw-r--r-- | src/librustpkg/tests.rs | 4 | ||||
| -rw-r--r-- | src/librustpkg/util.rs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs index 83dcde48b3a..44a8e696bde 100644 --- a/src/librustpkg/tests.rs +++ b/src/librustpkg/tests.rs @@ -144,10 +144,10 @@ fn command_line_test(args: &[~str], cwd: &Path) -> ProcessOutput { err_fd: None }); let output = prog.finish_with_output(); - io::println(fmt!("Output from command %s with args %? was %s {%s}[%?]", + debug!("Output from command %s with args %? was %s {%s}[%?]", cmd, args, str::from_bytes(output.output), str::from_bytes(output.error), - output.status)); + output.status); /* By the way, rustpkg *won't* return a nonzero exit code if it fails -- see #4547 diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index 38e6a4824af..cb9bbf80ea8 100644 --- a/src/librustpkg/util.rs +++ b/src/librustpkg/util.rs @@ -187,7 +187,7 @@ pub fn compile_input(ctxt: &Ctx, Lib => lib_crate, Test | Bench | Main => bin_crate }; - let matches = getopts(~[~"-Z", ~"time-passes"] + let matches = getopts(debug_flags() + match what { Lib => ~[~"--lib"], // --test compiles both #[test] and #[bench] fns @@ -415,3 +415,7 @@ mod test { } } + +// tjc: cheesy +fn debug_flags() -> ~[~str] { ~[] } +// static debug_flags: ~[~str] = ~[~"-Z", ~"time-passes"]; \ No newline at end of file |