---

yaml
---
r: 275827
b: refs/heads/auto
c: fd0632f
h: refs/heads/master
i:
  275825: e569e67
  275823: 910ad22

Author: Jonathan Turner

[refs]

@@ -8,7 +8,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: 399149ac7efda98e2290d5bf5c38f51d51b5b18f
+refs/heads/auto: fd0632fad63d5eb83a1571a1f854af98c5557b2a
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/tools/compiletest/src/json.rs

@@ -11,6 +11,7 @@
 use errors::{Error, ErrorKind};
 use rustc_serialize::json;
 use std::str::FromStr;
+use std::path::Path;
 
 // These structs are a subset of the ones found in
 // `syntax::errors::json`.
@@ -82,7 +83,9 @@ fn push_expected_errors(expected_errors: &mut Vec<Error>,
                         file_name: &str) {
     // We only consider messages pertaining to the current file.
     let matching_spans = || {
-        diagnostic.spans.iter().filter(|span| span.file_name == file_name)
+        diagnostic.spans.iter().filter(|span| {
+            Path::new(&span.file_name) == Path::new(&file_name)
+        })
     };
 
     // We break the output into multiple lines, and then append the