modified logging function to truncate output and adjusted error output formatting...

diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs
index 6e11d14aea9a316d069403083e9e97af069a6115..c53e7e8284103222e5eb8d72bae7e4e75e990f48 100644 (file)
--- a/src/libstd/logging.rs
+++ b/src/libstd/logging.rs
@@ -85,6 +85,16 @@ pub fn log_type<T>(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::<Task>() {

diff --git a/src/test/run-fail/assert-macro-explicit.rs b/src/test/run-fail/assert-macro-explicit.rs
index 8c35c92ffb0ba2bcf196224e7ed96575b3255f99..8e70c2c3561a2fce2364f19b98791a4929bc5981 100644 (file)
--- 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 d239760537821b6a5cc4a37847bf9d06b0070918..2159f68cc71701cf42c5d8812c4cecd833a2dc90 100644 (file)
--- 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 baa47dbbd356df6e45bbc7ba4cd45e3f22ea9678..f45af290b3d3da28e271af0fe7296aaf0f84150c 100644 (file)
--- 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 d47455173d1b97b2c6b49182792a7a355d9c92f6..a35258462deaa7f4ad569034ee07916d4981e939 100644 (file)
--- 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 eac80db40b9d23bb232dff246b76ea63746f21c2..13e3a6a31a8fa535139ddbe6710d9d5a41925781 100644 (file)
--- 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 363c572f3fe1eb50834d6dff23c1436301c9d60a..5fc51ac674581e34f6c64c571fd3a76d811e7792 100644 (file)
--- 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 e424647569a9f468632081118d6c3be4d416fb85..e59f5bdcaa1797d8e2507614879291f3f9488f1e 100644 (file)
--- 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 3235dc761a29dce54920002178737a4bf2c42d1e..688ca4ce7e5720145a6a7f2efc721753639c3bae 100644 (file)
--- 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");