restructure tests

Author: Mandragorian

tests/fail-dep/concurrency/libc_pthread_mutex_move.lock.stderr

@@ -1,6 +1,5 @@
 //@ignore-target-windows: No pthreads on Windows
-//@revisions: lock trylock unlock_register unlock_detect init
-//@[unlock_register]only-target-linux: recursive initializers are non-standard.
+//@revisions: static_initializer init
 
 fn main() {
     check();
@@ -17,54 +16,13 @@ fn check() {
     }
 }
 
-#[cfg(lock)]
+#[cfg(static_initializer)]
 fn check() {
     unsafe {
         let mut m: libc::pthread_mutex_t = libc::PTHREAD_MUTEX_INITIALIZER;
         libc::pthread_mutex_lock(&mut m as *mut _);
 
         let mut m2 = m;
-        libc::pthread_mutex_lock(&mut m2 as *mut _); //~[lock] ERROR: pthread_mutex_t can't be moved after first use
-    }
-}
-
-#[cfg(trylock)]
-fn check() {
-    unsafe {
-        let mut m: libc::pthread_mutex_t = libc::PTHREAD_MUTEX_INITIALIZER;
-        libc::pthread_mutex_trylock(&mut m as *mut _);
-
-        let mut m2 = m;
-        libc::pthread_mutex_trylock(&mut m2 as *mut _); //~[trylock] ERROR: pthread_mutex_t can't be moved after first use
-    }
-}
-
-#[cfg(unlock_register)]
-fn check() {
-    unsafe {
-        let mut m: libc::pthread_mutex_t = libc::PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-        libc::pthread_mutex_unlock(&mut m as *mut _);
-
-        let mut m2 = m;
-        libc::pthread_mutex_unlock(&mut m2 as *mut _); //~[unlock_register] ERROR: pthread_mutex_t can't be moved after first use
-    }
-}
-
-#[cfg(unlock_detect)]
-fn check() {
-    unsafe {
-        let mut mutexattr: libc::pthread_mutexattr_t = std::mem::zeroed();
-        assert_eq!(
-            libc::pthread_mutexattr_settype(
-                &mut mutexattr as *mut _,
-                libc::PTHREAD_MUTEX_RECURSIVE
-            ),
-            0,
-        );
-        let mut m: libc::pthread_mutex_t = std::mem::zeroed();
-        assert_eq!(libc::pthread_mutex_init(&mut m as *mut _, &mutexattr as *const _), 0);
-
-        let mut m2 = m;
-        libc::pthread_mutex_unlock(&mut m2 as *mut _); //~[unlock_detect] ERROR: pthread_mutex_t can't be moved after first use
+        libc::pthread_mutex_unlock(&mut m2 as *mut _); //~[static_initializer] ERROR: pthread_mutex_t can't be moved after first use
     }
 }