From 1422ac9a8f5841aee2db18e7819cf9ccda8085d0 Mon Sep 17 00:00:00 2001
From: Tim Neumann <mail@timnn.me>
Date: Tue, 25 Oct 2016 19:56:36 +0200
Subject: [PATCH] adapt tests

---
 src/test/codegen/abi-sysv64.rs          | 3 +++
 src/test/codegen/issue-32364.rs         | 3 +++
 src/test/compile-fail/variadic-ffi-2.rs | 2 +-
 src/test/compile-fail/variadic-ffi.rs   | 2 +-
 src/test/run-pass/extern-methods.rs     | 3 +++
 src/test/run-pass/extern-vectorcall.rs  | 3 +++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/test/codegen/abi-sysv64.rs b/src/test/codegen/abi-sysv64.rs
index 2b8e8a1b6b2..4f6a50eab49 100644
--- a/src/test/codegen/abi-sysv64.rs
+++ b/src/test/codegen/abi-sysv64.rs
@@ -12,6 +12,9 @@
 // llvm. Also checks that the abi-sysv64 feature gate allows usage
 // of the sysv64 abi.
 
+// ignore-arm
+// ignore-aarch64
+
 // compile-flags: -C no-prepopulate-passes
 
 #![crate_type = "lib"]
diff --git a/src/test/codegen/issue-32364.rs b/src/test/codegen/issue-32364.rs
index 926987be0e0..401253a315f 100644
--- a/src/test/codegen/issue-32364.rs
+++ b/src/test/codegen/issue-32364.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-arm
+// ignore-aarch64
+
 // compile-flags: -C no-prepopulate-passes
 
 struct Foo;
diff --git a/src/test/compile-fail/variadic-ffi-2.rs b/src/test/compile-fail/variadic-ffi-2.rs
index 1d519c978a3..afcad9d8f96 100644
--- a/src/test/compile-fail/variadic-ffi-2.rs
+++ b/src/test/compile-fail/variadic-ffi-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn baz(f: extern "stdcall" fn(usize, ...)) {
+fn baz(f: extern "cdecl" fn(usize, ...)) {
     //~^ ERROR: variadic function must have C calling convention
     f(22, 44);
 }
diff --git a/src/test/compile-fail/variadic-ffi.rs b/src/test/compile-fail/variadic-ffi.rs
index 12942178493..af2b552e20f 100644
--- a/src/test/compile-fail/variadic-ffi.rs
+++ b/src/test/compile-fail/variadic-ffi.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern "stdcall" {
+extern "cdecl" {
     fn printf(_: *const u8, ...); //~ ERROR: variadic function must have C calling convention
 }
 
diff --git a/src/test/run-pass/extern-methods.rs b/src/test/run-pass/extern-methods.rs
index 421b19f2864..2587a978636 100644
--- a/src/test/run-pass/extern-methods.rs
+++ b/src/test/run-pass/extern-methods.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-arm
+// ignore-aarch64
+
 trait A {
     extern "fastcall" fn test1(i: i32);
     extern fn test2(i: i32);
diff --git a/src/test/run-pass/extern-vectorcall.rs b/src/test/run-pass/extern-vectorcall.rs
index e8a9f92a93d..90c3459036b 100644
--- a/src/test/run-pass/extern-vectorcall.rs
+++ b/src/test/run-pass/extern-vectorcall.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-arm
+// ignore-aarch64
+
 #![feature(abi_vectorcall)]
 
 trait A {