---

yaml
---
r: 160423
b: refs/heads/master
c: 86992b6
h: refs/heads/master
i:
  160421: aff127c
  160419: 2fa0aec
  160415: 3fbe0c4
v: v3

Author: aturon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 243bfc277e0f222f81d4afe1f6f28b9fd1ffe6b4
+refs/heads/master: 86992b6437e36faa6a7bc1de434576ccedb7905d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
 refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe

trunk/src/test/run-pass/backtrace.rs

@@ -57,7 +57,9 @@ fn runtest(me: &str) {
     let out = p.wait_with_output().unwrap();
     assert!(!out.status.success());
     let s = str::from_utf8(out.error.as_slice()).unwrap();
-    assert!(s.contains("stack backtrace") && s.contains("double::h"),
+    // loosened the following from double::h to double:: due to
+    // spurious failures on mac, 32bit, optimized
+    assert!(s.contains("stack backtrace") && s.contains("double::"),
             "bad output3: {}", s);
 
     // Make sure a stack trace isn't printed too many times