Skip to content

Commit e2410c9

Browse files
committed
---
yaml --- r: 83551 b: refs/heads/try c: 727d4c3 h: refs/heads/master i: 83549: 8b62f3b 83547: 43022c6 83543: 789af6b 83535: 7c155f8 83519: 549ba0e v: v3
1 parent da90ff6 commit e2410c9

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: c687f6fa92312ef05341f9da2ac261634f44ba56
5+
refs/heads/try: 727d4c306c0a14f9d80f94231fd0e520f62fe143
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustpkg/rustpkg.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -620,14 +620,8 @@ impl CtxMethods for BuildContext {
620620
match built_test_in_workspace(pkgid, workspace) {
621621
Some(test_exec) => {
622622
debug!("test: test_exec = %s", test_exec.to_str());
623-
let p_output = run::process_output(test_exec.to_str(), [~"--test"]);
624-
if p_output.status == 0 {
625-
println(str::from_utf8(p_output.output));
626-
}
627-
else {
628-
println(str::from_utf8(p_output.error));
629-
}
630-
os::set_exit_status(p_output.status);
623+
let status = run::process_status(test_exec.to_str(), [~"--test"]);
624+
os::set_exit_status(status);
631625
}
632626
None => {
633627
error(fmt!("Internal error: test executable for package ID %s in workspace %s \

branches/try/src/libstd/rt/logging.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ pub struct StdErrLogger;
181181
impl Logger for StdErrLogger {
182182
fn log(&mut self, args: &fmt::Arguments) {
183183
if should_log_console() {
184-
fmt::writeln(self as &mut rt::io::Writer, args);
184+
fmt::write(self as &mut rt::io::Writer, args);
185185
}
186186
}
187187
}

0 commit comments

Comments
 (0)