---

yaml
---
r: 275692
b: refs/heads/master
c: fd0632f
h: refs/heads/master

Author: Jonathan Turner

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 399149ac7efda98e2290d5bf5c38f51d51b5b18f
+refs/heads/master: fd0632fad63d5eb83a1571a1f854af98c5557b2a
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/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