From 59e930ed5e226132fb7aa03c57ff6c7d93123c3c Mon Sep 17 00:00:00 2001
From: Rhys Kidd <rhyskidd@gmail.com>
Date: Wed, 12 Aug 2015 14:19:09 +0000
Subject: [PATCH] Properly guard memcheck/tests/amd64/xsave-avx. This test
 relies on memalign(), which is not present on OS X. Along with a few other
 avx tests needs refactoring to use posix_memalign() down the track. n-i-bz.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15528
---
 memcheck/tests/amd64/Makefile.am      | 5 ++++-
 memcheck/tests/amd64/xsave-avx.vgtest | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index dc48f417c..11381be5c 100644
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -46,7 +46,10 @@ check_PROGRAMS = \
 	sse_memory \
 	xor-undef-amd64
 if BUILD_AVX_TESTS
- check_PROGRAMS += sh-mem-vec256 xsave-avx
+ check_PROGRAMS += sh-mem-vec256
+if !VGCONF_OS_IS_DARWIN
+ check_PROGRAMS += xsave-avx
+endif
 endif
 if HAVE_ASM_CONSTRAINT_P
  check_PROGRAMS += insn-pcmpistri
diff --git a/memcheck/tests/amd64/xsave-avx.vgtest b/memcheck/tests/amd64/xsave-avx.vgtest
index dbc9803b4..0b2793a71 100644
--- a/memcheck/tests/amd64/xsave-avx.vgtest
+++ b/memcheck/tests/amd64/xsave-avx.vgtest
@@ -1,4 +1,4 @@
 prog: xsave-avx
-prereq: ../../../tests/x86_amd64_features amd64-avx
+prereq: test -x xsave-avx && ../../../tests/x86_amd64_features amd64-avx
 vgopts: -q
 args: x