From 93e8a3ffa009bf814c1b88f3f54ec3399a81a3ae Mon Sep 17 00:00:00 2001
From: Gregory Fong <address@hidden>
Date: Wed, 18 Feb 2015 13:09:52 -0800
Subject: [PATCH] Mark run-ptrace-mapper and run-ptrace-misc as XFAIL on ARM

This is similar to commit c90a2e02b3c1b03362a549a05261a4d0513d6026
"Mark run-ptrace-mapper and run-ptrace-misc as XFAIL on MIPS".
Starting with 2.6.39, ARM Linux returns -EIO for PTRACE_SINGLESTEP, so
we need to mark this as XFAIL for ARM too.

The Linux commit that changed this is

   commit 425fc47adb5bb69f76285be77a09a3341a30799e
   Author: Will Deacon <address@hidden>
   Date:   Mon Feb 14 14:31:09 2011 +0100

       ARM: 6668/1: ptrace: remove single-step emulation code

Signed-off-by: Gregory Fong <address@hidden>
---
 tests/Makefile.am | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9c62f92..fe2dba8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,10 +100,17 @@ if !ARCH_IA64
 XFAIL_TESTS += Gtest-dyn1 Ltest-dyn1
 endif
 
-if ARCH_MIPS
-# MIPS kernel does not support PTRACE_SINGLESTEP
+# Use if arch defines but does not support PTRACE_SINGLESTEP
 # ptrace request used in the tests.
-XFAIL_TESTS += run-ptrace-mapper run-ptrace-misc
+XFAIL_TESTS_PTRACE_SINGLESTEP = run-ptrace-mapper run-ptrace-misc
+
+if ARCH_MIPS
+XFAIL_TESTS += $(XFAIL_TESTS_PTRACE_SINGLESTEP)
+endif
+
+if ARCH_ARM
+# ARM Linux kernel >=2.6.39 removed PTRACE_SINGLESTEP emulation
+XFAIL_TESTS += $(XFAIL_TESTS_PTRACE_SINGLESTEP)
 endif
 
 noinst_PROGRAMS = $(noinst_PROGRAMS_common) $(noinst_PROGRAMS_cdep) \
-- 
1.9.1