about summary refs log tree commit diff
path: root/src/libstd
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/libstd
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/libstd')
-rw-r--r--src/libstd/cmp.rs2
-rw-r--r--src/libstd/deque.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs
index 5d7f64a7c8f..ea3793c1374 100644
--- a/src/libstd/cmp.rs
+++ b/src/libstd/cmp.rs
@@ -64,7 +64,7 @@ fn test_fuzzy_eq_eps() {
     assert!(!(&1.5f).fuzzy_eq_eps(&0.9, &0.5));
 }
 
-#[test]
+#[cfg(test)]
 mod test_complex{
     use cmp::*;
 
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index 5d52bb7c081..8a310a9f52b 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -353,7 +353,7 @@ mod tests {
         assert!(*deq.get(3) == d);
     }
 
-    #[test]
+    #[cfg(test)]
     fn test_parameterized<T:Copy + Eq + Durable>(a: T, b: T, c: T, d: T) {
         let mut deq = Deque::new();
         assert!(deq.len() == 0);