Properly guard memcheck/tests/amd64/xsave-avx. This test relies on memalign(), which...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15528

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index dc48f417c61f7ff0ac258b91c11698291ae8d60d..11381be5cb35781dbf0d561d6ea014a49672116d 100644 (file)
--- 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 dbc9803b4061ac277beb4514e815f20e12011f12..0b2793a71fd6aaa165ebbf39c4de183a57aeb55a 100644 (file)
--- 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