about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-02 00:15:46 -0700
committerbors <bors@rust-lang.org>2013-05-02 00:15:46 -0700
commitd1f7220219c722665e15b88aeecfc78601fa4f22 (patch)
treebaef8c898d0012ecfd8d5a1dd4252eea57a1485b /src/libsyntax/parse
parent5458d7dddda38f063220a19191373faecf11065f (diff)
parent9862cf703b8a867b13e674f892f7059b09fe59e0 (diff)
downloadrust-d1f7220219c722665e15b88aeecfc78601fa4f22.tar.gz
rust-d1f7220219c722665e15b88aeecfc78601fa4f22.zip
auto merge of #6111 : pnkfelix/rust/issue4391-rustc-should-not-silently-skip-erroneous-tests, r=pnkfelix
...e.

Fixes #4391.
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 74e4f562ce5..4f1d41a4a7a 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -418,7 +418,7 @@ mod test {
         new_parser_from_source_str(ps,~[],~"bogofile",source_str)
     }
 
-    #[test] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
+    #[cfg(test)] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
         do io::with_str_writer |writer| {
             val.encode(~std::json::Encoder(writer));
         }