about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Neumann <mneumann@ntecs.de>2016-02-21 13:10:51 +0100
committerMichael Neumann <mneumann@ntecs.de>2016-02-21 13:10:51 +0100
commit4ef60a27d9282d4d03d5109a3e2640bc8325e605 (patch)
treeac38be88e4e46188cee3577b24556479265da20e
parentc2c58a398d63fa5ee3c521851f769ec6cd4fdaa4 (diff)
downloadrust-4ef60a27d9282d4d03d5109a3e2640bc8325e605.tar.gz
rust-4ef60a27d9282d4d03d5109a3e2640bc8325e605.zip
Run thread-local-extern-static test only on supported platforms.
-rw-r--r--src/test/auxiliary/thread-local-extern-static.rs3
-rw-r--r--src/test/run-pass/thread-local-extern-static.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/auxiliary/thread-local-extern-static.rs b/src/test/auxiliary/thread-local-extern-static.rs
index e15546db970..d1971a5e1ae 100644
--- a/src/test/auxiliary/thread-local-extern-static.rs
+++ b/src/test/auxiliary/thread-local-extern-static.rs
@@ -9,8 +9,9 @@
 // except according to those terms.
 
 #![feature(thread_local)]
+#![feature(cfg_target_thread_local)]
 #![crate_type = "lib"]
 
 #[no_mangle]
-#[thread_local]
+#[cfg_attr(target_thread_local, thread_local)]
 pub static FOO: u32 = 3;
diff --git a/src/test/run-pass/thread-local-extern-static.rs b/src/test/run-pass/thread-local-extern-static.rs
index 5b5c35382e9..f80057b0024 100644
--- a/src/test/run-pass/thread-local-extern-static.rs
+++ b/src/test/run-pass/thread-local-extern-static.rs
@@ -11,11 +11,12 @@
 // aux-build:thread-local-extern-static.rs
 
 #![feature(thread_local)]
+#![feature(cfg_target_thread_local)]
 
 extern crate thread_local_extern_static;
 
 extern {
-    #[thread_local]
+    #[cfg_attr(target_thread_local, thread_local)]
     static FOO: u32;
 }