When testing std, don't create two variants of threading internals

src/libstd/lib.rs

@@ -338,7 +338,9 @@ extern crate backtrace_sys;
 // would generate duplicate lang item errors), and any globals it defines are
 // _not_ the globals used by "real" std. So this import, defined only during
 // testing gives test-std access to real-std lang items and globals. See #2912
-#[cfg(test)] extern crate std as realstd;
+#[cfg(test)]
+#[macro_use]
+extern crate std as realstd;
 
 #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
 #[macro_use]
@@ -442,7 +444,13 @@ pub mod f32;
 pub mod f64;
 
 #[macro_use]
+#[cfg(not(test))]
 pub mod thread;
+#[cfg(test)]
+pub use realstd::thread;
+#[cfg(test)]
+#[path = "thread/tests.rs"]
+mod thread_tests;
 pub mod ascii;
 pub mod collections;
 pub mod env;

src/libstd/panicking.rs

@@ -300,6 +300,7 @@ pub unsafe fn try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> {
 }
 
 /// Determines whether the current thread is unwinding because of panic.
+#[cfg(not(test))]
 pub fn panicking() -> bool {
     update_panic_count(0) != 0
 }

src/libstd/sys/cloudabi/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use cmp;
 use ffi::CStr;

src/libstd/sys/redox/ext/mod.rs

@@ -25,7 +25,10 @@ pub mod fs;
 pub mod io;
 pub mod net;
 pub mod process;
+#[cfg(not(test))]
 pub mod thread;
+#[cfg(test)]
+pub use realstd::os::redox::thread;
 
 /// A prelude for conveniently writing platform-specific code.
 ///

src/libstd/sys/redox/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use ffi::CStr;
 use io;

src/libstd/sys/sgx/abi/tls.rs

@@ -10,45 +10,14 @@ const USIZE_BITS: usize = 64;
 const TLS_KEYS: usize = 128; // Same as POSIX minimum
 const TLS_KEYS_BITSET_SIZE: usize = (TLS_KEYS + (USIZE_BITS - 1)) / USIZE_BITS;
 
+#[cfg(not(test))]
 static TLS_KEY_IN_USE: SyncBitset = SYNC_BITSET_INIT;
 macro_rules! dup {
     ((* $($exp:tt)*) $($val:tt)*) => (dup!( ($($exp)*) $($val)* $($val)* ));
     (() $($val:tt)*) => ([$($val),*])
 }
-static TLS_DESTRUCTOR: [AtomicUsize; TLS_KEYS] = [
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-    AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0),
-];
+#[cfg(not(test))]
+static TLS_DESTRUCTOR: [AtomicUsize; TLS_KEYS] = dup!((* * * * * * *) (AtomicUsize::new(0)));
 
 extern "C" {
     fn get_tls_ptr() -> *const u8;
@@ -86,6 +55,7 @@ pub struct ActiveTls<'a> {
     tls: &'a Tls
 }
 
+#[cfg(not(test))]
 impl<'a> Drop for ActiveTls<'a> {
     fn drop(&mut self) {
         let value_with_destructor = |key: usize| {
@@ -127,7 +97,10 @@ impl Tls {
     unsafe fn current<'a>() -> &'a Tls {
         &*(get_tls_ptr() as *const Tls)
     }
+}
 
+#[cfg(not(test))]
+impl Tls {
     pub fn create(dtor: Option<unsafe extern fn(*mut u8)>) -> Key {
         let index = TLS_KEY_IN_USE.set().expect("TLS limit exceeded");
         TLS_DESTRUCTOR[index].store(dtor.map_or(0, |f| f as usize), Ordering::Relaxed);
@@ -151,6 +124,25 @@ impl Tls {
     }
 }
 
+#[cfg(test)]
+impl Tls {
+    pub fn create(_dtor: Option<unsafe extern fn(*mut u8)>) -> Key {
+        rtabort!("Calling cfg-test version of thread-local storage internals")
+    }
+
+    pub fn set(_key: Key, _value: *mut u8) {
+        rtabort!("Calling cfg-test version of thread-local storage internals")
+    }
+
+    pub fn get(_key: Key) -> *mut u8 {
+        rtabort!("Calling cfg-test version of thread-local storage internals")
+    }
+
+    pub fn destroy(_key: Key) {
+        rtabort!("Calling cfg-test version of thread-local storage internals")
+    }
+}
+
 mod sync_bitset {
     use sync::atomic::{AtomicUsize, Ordering};
     use iter::{Enumerate, Peekable};

src/libstd/sys/sgx/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use ffi::CStr;
 use io;
@@ -10,8 +12,7 @@ pub struct Thread(task_queue::JoinHandle);
 pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
 
 mod task_queue {
-    use sync::{Mutex, MutexGuard, Once};
-    use sync::mpsc;
+    use sync::{MutexGuard, mpsc};
     use boxed::FnBox;
 
     pub type JoinHandle = mpsc::Receiver<()>;
@@ -33,15 +34,23 @@ mod task_queue {
         }
     }
 
-    static TASK_QUEUE_INIT: Once = Once::new();
-    static mut TASK_QUEUE: Option<Mutex<Vec<Task>>> = None;
-
+    #[cfg(not(test))]
     pub(super) fn lock() -> MutexGuard<'static, Vec<Task>> {
+        use sync::{Mutex, Once};
+
+        static TASK_QUEUE_INIT: Once = Once::new();
+        static mut TASK_QUEUE: Option<Mutex<Vec<Task>>> = None;
+
         unsafe {
             TASK_QUEUE_INIT.call_once(|| TASK_QUEUE = Some(Default::default()) );
             TASK_QUEUE.as_ref().unwrap().lock().unwrap()
         }
     }
+
+    #[cfg(test)]
+    pub(super) fn lock() -> MutexGuard<'static, Vec<Task>> {
+        rtabort!("Calling cfg-test version of threading internals")
+    }
 }
 
 impl Thread {

src/libstd/sys/unix/ext/mod.rs

@@ -32,7 +32,10 @@ pub mod ffi;
 pub mod fs;
 pub mod process;
 pub mod raw;
+#[cfg(not(test))]
 pub mod thread;
+#[cfg(test)]
+pub use realstd::os::unix::thread;
 pub mod net;
 
 /// A prelude for conveniently writing platform-specific code.

src/libstd/sys/unix/fast_thread_local.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(test, allow(dead_code))]
 #![cfg(target_thread_local)]
 #![unstable(feature = "thread_local_internals", issue = "0")]
 

src/libstd/sys/unix/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use cmp;
 use ffi::CStr;

src/libstd/sys/wasm/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use ffi::CStr;
 use io;

src/libstd/sys/windows/ext/mod.rs

@@ -15,7 +15,10 @@ pub mod fs;
 pub mod io;
 pub mod raw;
 pub mod process;
+#[cfg(not(test))]
 pub mod thread;
+#[cfg(test)]
+pub use realstd::os::windows::thread;
 
 /// A prelude for conveniently writing platform-specific code.
 ///

src/libstd/sys/windows/thread.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(test, allow(dead_code))]
+
 use boxed::FnBox;
 use io;
 use ffi::CStr;

src/libstd/sys_common/thread.rs

@@ -1,10 +1,11 @@
+#![allow(dead_code)]
+
 use boxed::FnBox;
 use env;
 use sync::atomic::{self, Ordering};
 use sys::stack_overflow;
 use sys::thread as imp;
 
-#[allow(dead_code)]
 pub unsafe fn start_thread(main: *mut u8) {
     // Next, set up our stack overflow handler which may get triggered if we run
     // out of stack.

src/libstd/sys_common/thread_info.rs

@@ -12,6 +12,7 @@ struct ThreadInfo {
 thread_local! { static THREAD_INFO: RefCell<Option<ThreadInfo>> = RefCell::new(None) }
 
 impl ThreadInfo {
+    #[cfg(not(test))]
     fn with<R, F>(f: F) -> Option<R> where F: FnOnce(&mut ThreadInfo) -> R {
         THREAD_INFO.try_with(move |c| {
             if c.borrow().is_none() {
@@ -23,6 +24,11 @@ impl ThreadInfo {
             f(c.borrow_mut().as_mut().unwrap())
         }).ok()
     }
+
+    #[cfg(test)]
+    fn with<R, F>(_f: F) -> Option<R> where F: FnOnce(&mut ThreadInfo) -> R {
+        None
+    }
 }
 
 pub fn current_thread() -> Option<Thread> {