Merge pull request #58 from Rust-for-Linux/dev/ignore-tests

examples, tests: use `ignore` instead of conditionally compiling tests

Author: BennoLossin

examples/pthread_mutex.rs

@@ -139,7 +139,8 @@ mod pthread_mtx {
     }
 }
 
-#[cfg_attr(all(test, not(miri)), test)]
+#[cfg_attr(test, test)]
+#[cfg_attr(all(test, miri), ignore)]
 fn main() {
     #[cfg(all(any(feature = "std", feature = "alloc"), not(windows)))]
     {

tests/alloc_fail.rs

@@ -1,15 +1,10 @@
 #![cfg_attr(feature = "alloc", feature(allocator_api))]
 #![cfg_attr(not(RUSTC_LINT_REASONS_IS_STABLE), feature(lint_reasons))]
 
-#[cfg(all(
-    feature = "alloc",
-    not(miri),
-    not(NO_ALLOC_FAIL_TESTS),
-    not(target_os = "macos")
-))]
 #[test]
+#[cfg(feature = "alloc")]
+#[cfg_attr(any(miri, NO_ALLOC_FAIL_TESTS, target_os = "macos"), ignore)]
 fn too_big_in_place() {
-    #[cfg(feature = "alloc")]
     use core::alloc::AllocError;
 
     use pin_init::*;

tests/ring_buf.rs

@@ -200,8 +200,8 @@ fn even_stack() {
     assert_eq!(val, Err(()));
 }
 
-#[cfg(any(feature = "std", feature = "alloc"))]
 #[test]
+#[cfg(any(feature = "std", feature = "alloc"))]
 fn even_failing() {
     assert!(matches!(Box::try_pin_init(EvenU64::new2(3)), Err(Error)));
     assert!(matches!(Box::try_init(EvenU64::new2(3)), Err(Error)));
@@ -253,8 +253,9 @@ struct BigStruct {
     oth: MaybeUninit<u8>,
 }
 
-#[cfg(all(any(feature = "std", feature = "alloc"), not(miri)))]
 #[test]
+#[cfg(any(feature = "std", feature = "alloc"))]
+#[cfg_attr(miri, ignore)]
 fn big_struct() {
     let x = Arc::init(init!(BigStruct {
         buf <- init_zeroed(),
@@ -268,8 +269,9 @@ fn big_struct() {
     println!("{x:?}");
 }
 
-#[cfg(all(any(feature = "std", feature = "alloc"), not(miri)))]
 #[test]
+#[cfg(any(feature = "std", feature = "alloc"))]
+#[cfg_attr(miri, ignore)]
 fn with_big_struct() {
     #[allow(unused_attributes)]
     #[path = "../examples/mutex.rs"]
@@ -299,13 +301,9 @@ fn with_big_struct() {
     }
 }
 
-#[cfg(all(
-    feature = "alloc",
-    not(miri),
-    not(NO_ALLOC_FAIL_TESTS),
-    not(target_os = "macos")
-))]
 #[test]
+#[cfg(feature = "alloc")]
+#[cfg_attr(any(miri, NO_ALLOC_FAIL_TESTS, target_os = "macos"), ignore)]
 fn too_big_pinned() {
     use core::alloc::AllocError;
 

tests/ui.rs

@@ -1,7 +1,7 @@
 #![cfg_attr(not(RUSTC_LINT_REASONS_IS_STABLE), feature(lint_reasons))]
 
-#[cfg(not(any(miri, NO_UI_TESTS)))]
 #[test]
+#[cfg_attr(any(miri, NO_UI_TESTS), ignore)]
 fn compile_fail() {
     let test_cases = trybuild::TestCases::new();
     test_cases.compile_fail("tests/ui/compile-fail/pinned_drop/*.rs");
@@ -10,8 +10,8 @@ fn compile_fail() {
     test_cases.compile_fail("tests/ui/compile-fail/zeroable/*.rs");
 }
 
-#[cfg(not(any(miri, NO_UI_TESTS)))]
 #[test]
+#[cfg_attr(any(miri, NO_UI_TESTS), ignore)]
 fn expand() {
     macrotest::expand("tests/ui/expand/*.rs");
 }