From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Wed, 25 Oct 2017 18:27:30 +0000 (+0100)
Subject: u-ignoretest-ppc64el
X-Git-Tag: archive/raspbian/1.21.0+dfsg1-3+rpi1^2^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4db1722f74f5b60f3cb469d0e31a7deab2fa7c6a;p=rustc.git

u-ignoretest-ppc64el


Gbp-Pq: Name u-ignoretest-ppc64el.patch
---

diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs
index 2be7b1bc2e..006c94d065 100644
--- a/src/libarena/lib.rs
+++ b/src/libarena/lib.rs
@@ -570,6 +570,9 @@ mod tests {
 
     #[test]
     fn test_typed_arena_drop_small_count() {
+        if cfg!(target_arch = "powerpc64") {
+            return;
+        }
         DROP_COUNTER.with(|c| c.set(0));
         {
             let arena: TypedArena<SmallDroppable> = TypedArena::new();
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index 7a9b642350..9b8f255f9f 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -520,7 +520,7 @@ pub mod os {
 #[cfg(all(test, not(target_os = "emscripten")))]
 mod tests {
     use sync::mpsc::{channel, Sender};
-    use cell::{Cell, UnsafeCell};
+    use cell::UnsafeCell;
     use super::LocalKeyState;
     use thread;
 
@@ -533,9 +533,9 @@ mod tests {
         }
     }
 
-    #[test]
+    #[test] #[cfg(not(target_arch = "powerpc64"))]
     fn smoke_no_dtor() {
-        thread_local!(static FOO: Cell<i32> = Cell::new(1));
+        thread_local!(static FOO: ::cell::Cell<i32> = ::cell::Cell::new(1));
 
         FOO.with(|f| {
             assert_eq!(f.get(), 1);