---

yaml
---
r: 160436
b: refs/heads/auto
c: 86992b6
h: refs/heads/master
v: v3

Author: aturon

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 243bfc277e0f222f81d4afe1f6f28b9fd1ffe6b4
+refs/heads/auto: 86992b6437e36faa6a7bc1de434576ccedb7905d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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