about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-09 20:31:31 -0700
committerbors <bors@rust-lang.org>2014-05-09 20:31:31 -0700
commit5b4774dafc6e1470fdd3c29c5ac365a5a1fa4a60 (patch)
tree750630afd0bdc34bbf9ce2ad4136850c4bb40e7d
parentfb8773463af1d627f8c5aec49ce993cf50b5b356 (diff)
parent300109e5ebc8b36fc5e8d250e81e44ff9541a84c (diff)
downloadrust-5b4774dafc6e1470fdd3c29c5ac365a5a1fa4a60.tar.gz
rust-5b4774dafc6e1470fdd3c29c5ac365a5a1fa4a60.zip
auto merge of #14065 : alexcrichton/rust/ignore-flaky-windows-test, r=brson
See #14064 for some rationale, but the basic idea is that I suspect that there
is an LLVM codegen bug somewhere, and I'm not entirely sure why it's happening
intermittently rather than deterministically...

cc #14064
-rw-r--r--src/libserialize/json.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 2e4d7696c44..abc64fcde5f 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -3098,6 +3098,7 @@ mod tests {
         }
     }
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#14064)
     fn test_read_object_streaming() {
         assert_eq!(last_event("{ "),      Error(SyntaxError(EOFWhileParsingObject, 1, 3)));
         assert_eq!(last_event("{1"),      Error(SyntaxError(KeyMustBeAString,      1, 2)));
@@ -3169,6 +3170,7 @@ mod tests {
         );
     }
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#14064)
     fn test_read_list_streaming() {
         assert_stream_equal(
             "[]",