From b913547fc5421652dc4231c0f62f1c6931c47c5b Mon Sep 17 00:00:00 2001 From: toddaaro Date: Fri, 2 Aug 2013 16:48:29 -0700 Subject: [PATCH 1/2] modified logging function to truncate output and adjusted error output formatting tests to be compatible with both the new and old runtimes --- src/libstd/logging.rs | 10 ++++++++++ src/test/run-fail/assert-macro-explicit.rs | 2 +- src/test/run-fail/assert-macro-fmt.rs | 2 +- src/test/run-fail/assert-macro-owned.rs | 2 +- src/test/run-fail/assert-macro-static.rs | 2 +- src/test/run-fail/fail-macro-explicit.rs | 2 +- src/test/run-fail/fail-macro-fmt.rs | 2 +- src/test/run-fail/fail-macro-owned.rs | 2 +- src/test/run-fail/fail-macro-static.rs | 2 +- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs index e3dae5308fed9..91622e491075e 100644 --- a/src/libstd/logging.rs +++ b/src/libstd/logging.rs @@ -85,6 +85,16 @@ pub fn log_type(level: u32, object: &T) { fn newsched_log_str(msg: ~str) { use rt::task::Task; use rt::local::Local; + use str::StrSlice; + use container::Container; + + // Truncate the string + let buf_bytes = 2048; + let msg = if msg.len() > buf_bytes { + msg.slice(0, buf_bytes) + "[...]" + } else { + msg + }; unsafe { match Local::try_unsafe_borrow::() { diff --git a/src/test/run-fail/assert-macro-explicit.rs b/src/test/run-fail/assert-macro-explicit.rs index 8c35c92ffb0ba..8e70c2c3561a2 100644 --- a/src/test/run-fail/assert-macro-explicit.rs +++ b/src/test/run-fail/assert-macro-explicit.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'assertion failed: false' +// error-pattern:failed at 'assertion failed: false' fn main() { assert!(false); diff --git a/src/test/run-fail/assert-macro-fmt.rs b/src/test/run-fail/assert-macro-fmt.rs index d239760537821..2159f68cc7170 100644 --- a/src/test/run-fail/assert-macro-fmt.rs +++ b/src/test/run-fail/assert-macro-fmt.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-assert-fmt 42 rust' +// error-pattern:failed at 'test-assert-fmt 42 rust' fn main() { assert!(false, "test-assert-fmt %d %s", 42, "rust"); diff --git a/src/test/run-fail/assert-macro-owned.rs b/src/test/run-fail/assert-macro-owned.rs index baa47dbbd356d..f45af290b3d3d 100644 --- a/src/test/run-fail/assert-macro-owned.rs +++ b/src/test/run-fail/assert-macro-owned.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-assert-owned' +// error-pattern:failed at 'test-assert-owned' fn main() { assert!(false, ~"test-assert-owned"); diff --git a/src/test/run-fail/assert-macro-static.rs b/src/test/run-fail/assert-macro-static.rs index d47455173d1b9..a35258462deaa 100644 --- a/src/test/run-fail/assert-macro-static.rs +++ b/src/test/run-fail/assert-macro-static.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-assert-static' +// error-pattern:failed at 'test-assert-static' fn main() { assert!(false, "test-assert-static"); diff --git a/src/test/run-fail/fail-macro-explicit.rs b/src/test/run-fail/fail-macro-explicit.rs index eac80db40b9d2..13e3a6a31a8fa 100644 --- a/src/test/run-fail/fail-macro-explicit.rs +++ b/src/test/run-fail/fail-macro-explicit.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'explicit failure' +// error-pattern:failed at 'explicit failure' fn main() { fail!(); diff --git a/src/test/run-fail/fail-macro-fmt.rs b/src/test/run-fail/fail-macro-fmt.rs index 363c572f3fe1e..5fc51ac674581 100644 --- a/src/test/run-fail/fail-macro-fmt.rs +++ b/src/test/run-fail/fail-macro-fmt.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-fail-fmt 42 rust' +// error-pattern:failed at 'test-fail-fmt 42 rust' fn main() { fail!("test-fail-fmt %d %s", 42, "rust"); diff --git a/src/test/run-fail/fail-macro-owned.rs b/src/test/run-fail/fail-macro-owned.rs index e424647569a9f..e59f5bdcaa179 100644 --- a/src/test/run-fail/fail-macro-owned.rs +++ b/src/test/run-fail/fail-macro-owned.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-fail-owned' +// error-pattern:failed at 'test-fail-owned' fn main() { fail!("test-fail-owned"); diff --git a/src/test/run-fail/fail-macro-static.rs b/src/test/run-fail/fail-macro-static.rs index 3235dc761a29d..688ca4ce7e572 100644 --- a/src/test/run-fail/fail-macro-static.rs +++ b/src/test/run-fail/fail-macro-static.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:task failed at 'test-fail-static' +// error-pattern:failed at 'test-fail-static' fn main() { fail!("test-fail-static"); From 84698a7e190f827ccd7b0cba1d0ce7f186366d20 Mon Sep 17 00:00:00 2001 From: toddaaro Date: Fri, 2 Aug 2013 16:53:04 -0700 Subject: [PATCH 2/2] fixed the buffer to make it a more reasonable size --- src/libstd/logging.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs index 91622e491075e..cb7f30413983c 100644 --- a/src/libstd/logging.rs +++ b/src/libstd/logging.rs @@ -89,7 +89,7 @@ fn newsched_log_str(msg: ~str) { use container::Container; // Truncate the string - let buf_bytes = 2048; + let buf_bytes = 256; let msg = if msg.len() > buf_bytes { msg.slice(0, buf_bytes) + "[...]" } else {