user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore entire test modules on emscripten instead of individual tests

Browse source
This commit is contained in:
Brian Anderson 2016-09-14 17:10:43 +00:00
parent 37abec06e5
commit 183b2ddce4
8 changed files with 10 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/libstd/sync/mpsc/mod.rs
View file

@ -1268,7 +1268,7 @@ impl error::Error for TryRecvError {
}
}
#[cfg(test)]
#[cfg(all(test, not(target_os = "emscripten")))]
mod tests {
use env;
use super::*;
@ -1314,7 +1314,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn smoke_threads() {
let (tx, rx) = channel::<i32>();
let _t = thread::spawn(move|| {
@ -1347,7 +1346,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn port_gone_concurrent() {
let (tx, rx) = channel::<i32>();
let _t = thread::spawn(move|| {
@ -1357,7 +1355,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn port_gone_concurrent_shared() {
let (tx, rx) = channel::<i32>();
let tx2 = tx.clone();
@ -1384,7 +1381,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn chan_gone_concurrent() {
let (tx, rx) = channel::<i32>();
let _t = thread::spawn(move|| {
@ -1395,7 +1391,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress() {
let (tx, rx) = channel::<i32>();
let t = thread::spawn(move|| {
@ -1408,7 +1403,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_shared() {
const AMT: u32 = 10000;
const NTHREADS: u32 = 8;
@ -1435,7 +1429,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn send_from_outside_runtime() {
let (tx1, rx1) = channel::<()>();
let (tx2, rx2) = channel::<i32>();
@ -1456,7 +1449,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn recv_from_outside_runtime() {
let (tx, rx) = channel::<i32>();
let t = thread::spawn(move|| {
@ -1471,7 +1463,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn no_runtime() {
let (tx1, rx1) = channel::<i32>();
let (tx2, rx2) = channel::<i32>();
@ -1510,7 +1501,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_single_thread_recv_chan_close() {
// Receiving on a closed chan will panic
let res = thread::spawn(move|| {
@ -1580,7 +1570,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_task_recv_then_send() {
let (tx, rx) = channel::<Box<i32>>();
let _t = thread::spawn(move|| {
@ -1591,7 +1580,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_task_recv_then_close() {
let (tx, rx) = channel::<Box<i32>>();
let _t = thread::spawn(move|| {
@ -1604,7 +1592,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel::<i32>();
@ -1616,7 +1603,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_send_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel::<i32>();
@ -1630,7 +1616,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_recv_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel::<i32>();
@ -1649,7 +1634,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel::<Box<isize>>();
@ -1661,7 +1645,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stream_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel();
@ -1700,7 +1683,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_recv_timeout_two_threads() {
let (tx, rx) = channel();
let stress = stress_factor() + 100;
@ -1742,7 +1724,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_recv_timeout_shared() {
let (tx, rx) = channel();
let stress = stress_factor() + 100;
@ -1781,7 +1762,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn shared_recv_timeout() {
let (tx, rx) = channel();
let total = 5;
@ -1800,7 +1780,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn shared_chan_stress() {
let (tx, rx) = channel();
let total = stress_factor() + 100;
@ -1817,7 +1796,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn test_nested_recv_iter() {
let (tx, rx) = channel::<i32>();
let (total_tx, total_rx) = channel::<i32>();
@ -1838,7 +1816,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn test_recv_iter_break() {
let (tx, rx) = channel::<i32>();
let (count_tx, count_rx) = channel();
@ -1864,7 +1841,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn test_recv_try_iter() {
let (request_tx, request_rx) = channel();
let (response_tx, response_rx) = channel();
@ -1919,7 +1895,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn try_recv_states() {
let (tx1, rx1) = channel::<i32>();
let (tx2, rx2) = channel::<()>();
@ -1946,7 +1921,6 @@ mod tests {
// This bug used to end up in a livelock inside of the Receiver destructor
// because the internal state of the Shared packet was corrupted
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn destroy_upgraded_shared_port_when_sender_still_active() {
let (tx, rx) = channel();
let (tx2, rx2) = channel();
@ -1968,7 +1942,7 @@ mod tests {
}
}
#[cfg(test)]
#[cfg(all(test, not(target_os = "emscripten")))]
mod sync_tests {
use env;
use thread;
@ -2014,7 +1988,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn smoke_threads() {
let (tx, rx) = sync_channel::<i32>(0);
let _t = thread::spawn(move|| {
@ -2040,7 +2013,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn port_gone_concurrent() {
let (tx, rx) = sync_channel::<i32>(0);
let _t = thread::spawn(move|| {
@ -2050,7 +2022,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn port_gone_concurrent_shared() {
let (tx, rx) = sync_channel::<i32>(0);
let tx2 = tx.clone();
@ -2077,7 +2048,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn chan_gone_concurrent() {
let (tx, rx) = sync_channel::<i32>(0);
thread::spawn(move|| {
@ -2088,7 +2058,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress() {
let (tx, rx) = sync_channel::<i32>(0);
thread::spawn(move|| {
@ -2100,7 +2069,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_recv_timeout_two_threads() {
let (tx, rx) = sync_channel::<i32>(0);
@ -2124,7 +2092,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_recv_timeout_shared() {
const AMT: u32 = 1000;
const NTHREADS: u32 = 8;
@ -2163,7 +2130,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress_shared() {
const AMT: u32 = 1000;
const NTHREADS: u32 = 8;
@ -2214,7 +2180,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_single_thread_recv_chan_close() {
// Receiving on a closed chan will panic
let res = thread::spawn(move|| {
@ -2299,7 +2264,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_task_recv_then_send() {
let (tx, rx) = sync_channel::<Box<i32>>(0);
let _t = thread::spawn(move|| {
@ -2310,7 +2274,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_task_recv_then_close() {
let (tx, rx) = sync_channel::<Box<i32>>(0);
let _t = thread::spawn(move|| {
@ -2323,7 +2286,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = sync_channel::<i32>(0);
@ -2335,7 +2297,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_send_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = sync_channel::<i32>(0);
@ -2349,7 +2310,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_recv_close_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = sync_channel::<i32>(0);
@ -2368,7 +2328,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_multi_thread_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = sync_channel::<Box<i32>>(0);
@ -2380,7 +2339,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stream_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = sync_channel::<Box<i32>>(0);
@ -2417,7 +2375,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn shared_chan_stress() {
let (tx, rx) = sync_channel(0);
let total = stress_factor() + 100;
@ -2434,7 +2391,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn test_nested_recv_iter() {
let (tx, rx) = sync_channel::<i32>(0);
let (total_tx, total_rx) = sync_channel::<i32>(0);
@ -2455,7 +2411,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn test_recv_iter_break() {
let (tx, rx) = sync_channel::<i32>(0);
let (count_tx, count_rx) = sync_channel(0);
@ -2481,7 +2436,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn try_recv_states() {
let (tx1, rx1) = sync_channel::<i32>(1);
let (tx2, rx2) = sync_channel::<()>(1);
@ -2508,7 +2462,6 @@ mod sync_tests {
// This bug used to end up in a livelock inside of the Receiver destructor
// because the internal state of the Shared packet was corrupted
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn destroy_upgraded_shared_port_when_sender_still_active() {
let (tx, rx) = sync_channel::<()>(0);
let (tx2, rx2) = sync_channel::<()>(0);
@ -2530,7 +2483,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn send1() {
let (tx, rx) = sync_channel::<i32>(0);
let _t = thread::spawn(move|| { rx.recv().unwrap(); });
@ -2538,7 +2490,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn send2() {
let (tx, rx) = sync_channel::<i32>(0);
let _t = thread::spawn(move|| { drop(rx); });
@ -2546,7 +2497,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn send3() {
let (tx, rx) = sync_channel::<i32>(1);
assert_eq!(tx.send(1), Ok(()));
@ -2555,7 +2505,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn send4() {
let (tx, rx) = sync_channel::<i32>(0);
let tx2 = tx.clone();
@ -2596,7 +2545,6 @@ mod sync_tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn issue_15761() {
fn repro() {
let (tx1, rx1) = sync_channel::<()>(3);

13
src/libstd/sync/mpsc/select.rs
View file

@ -366,7 +366,7 @@ impl<'rx, T:Send+'rx> fmt::Debug for Handle<'rx, T> {
}
}
#[cfg(test)]
#[cfg(all(test, not(target_os = "emscripten")))]
#[allow(unused_imports)]
mod tests {
use thread;
@ -444,7 +444,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn unblocks() {
let (tx1, rx1) = channel::<i32>();
let (_tx2, rx2) = channel::<i32>();
@ -469,7 +468,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn both_ready() {
let (tx1, rx1) = channel::<i32>();
let (tx2, rx2) = channel::<i32>();
@ -496,7 +494,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stress() {
const AMT: i32 = 10000;
let (tx1, rx1) = channel::<i32>();
@ -524,7 +521,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn cloning() {
let (tx1, rx1) = channel::<i32>();
let (_tx2, rx2) = channel::<i32>();
@ -547,7 +543,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn cloning2() {
let (tx1, rx1) = channel::<i32>();
let (_tx2, rx2) = channel::<i32>();
@ -570,7 +565,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn cloning3() {
let (tx1, rx1) = channel::<()>();
let (tx2, rx2) = channel::<()>();
@ -688,7 +682,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn oneshot_data_waiting() {
let (tx1, rx1) = channel();
let (tx2, rx2) = channel();
@ -705,7 +698,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn stream_data_waiting() {
let (tx1, rx1) = channel();
let (tx2, rx2) = channel();
@ -726,7 +718,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn shared_data_waiting() {
let (tx1, rx1) = channel();
let (tx2, rx2) = channel();
@ -755,7 +746,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync2() {
let (tx, rx) = sync_channel::<i32>(0);
let _t = thread::spawn(move|| {
@ -768,7 +758,6 @@ mod tests {
}
#[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync3() {
let (tx1, rx1) = sync_channel::<i32>(0);
let (tx2, rx2): (Sender<i32>, Receiver<i32>) = channel();