Skip to content

Commit

Permalink
auto merge of rust-lang#14178 : alexcrichton/rust/more-ignores, r=brson
Browse files Browse the repository at this point in the history
It was thought that these failures only happened on windows, turns out they
happen on any 32-bit machine.

cc rust-lang#14064
  • Loading branch information
bors committed May 14, 2014
2 parents e441473 + af00c57 commit 2e02f6e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libserialize/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,7 @@ mod tests {
}
}
#[test]
#[ignore(cfg(windows))] // FIXME(#14064)
#[ignore(cfg(target_word_size = "32"))] // 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)));
Expand Down Expand Up @@ -3170,7 +3170,7 @@ mod tests {
);
}
#[test]
#[ignore(cfg(windows))] // FIXME(#14064)
#[ignore(cfg(target_word_size = "32"))] // FIXME(#14064)
fn test_read_list_streaming() {
assert_stream_equal(
"[]",
Expand Down

0 comments on commit 2e02f6e

Please sign in to comment.