Properly guard exp-bbv/tests/x86/ on OS X. Partial fix for BZ#344416 (at least reduces required hacks).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15175 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/exp-bbv/tests/Makefile.am b/exp-bbv/tests/Makefile.am
index 359ba22..5261cee 100644
--- a/exp-bbv/tests/Makefile.am
+++ b/exp-bbv/tests/Makefile.am
@@ -5,8 +5,10 @@
# Platform-specific tests
if VGCONF_ARCHS_INCLUDE_X86
+if !VGCONF_OS_IS_DARWIN
SUBDIRS += x86
endif
+endif
if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
SUBDIRS += x86-linux
endif
diff --git a/exp-bbv/tests/x86/complex_rep.vgtest b/exp-bbv/tests/x86/complex_rep.vgtest
index ef5ac30..506a1e8 100644
--- a/exp-bbv/tests/x86/complex_rep.vgtest
+++ b/exp-bbv/tests/x86/complex_rep.vgtest
@@ -1,3 +1,4 @@
+prereq: test -e complex_rep
prog: complex_rep
vgopts: --interval-size=100000 --bb-out-file=complex_rep.out.bb
cleanup: rm complex_rep.out.bb
diff --git a/exp-bbv/tests/x86/fldcw_check.vgtest b/exp-bbv/tests/x86/fldcw_check.vgtest
index f9bbae9..d030ddb 100644
--- a/exp-bbv/tests/x86/fldcw_check.vgtest
+++ b/exp-bbv/tests/x86/fldcw_check.vgtest
@@ -1,3 +1,4 @@
+prereq: test -e fldcw_check
prog: fldcw_check
vgopts: --interval-size=10000 --bb-out-file=fldcw_check.out.bb
cleanup: rm fldcw_check.out.bb
diff --git a/exp-bbv/tests/x86/million.vgtest b/exp-bbv/tests/x86/million.vgtest
index fc91c77..3ce2fb5 100644
--- a/exp-bbv/tests/x86/million.vgtest
+++ b/exp-bbv/tests/x86/million.vgtest
@@ -1,4 +1,5 @@
-prog: million
+prereq: test -e million
+prog: million
vgopts: --interval-size=100000 --bb-out-file=million.out.bb --pc-out-file=million.out.pc
post: cat million.out.bb
cleanup: rm million.out.bb million.out.pc
diff --git a/exp-bbv/tests/x86/rep_prefix.vgtest b/exp-bbv/tests/x86/rep_prefix.vgtest
index bc89a1c..aa8b7d3 100644
--- a/exp-bbv/tests/x86/rep_prefix.vgtest
+++ b/exp-bbv/tests/x86/rep_prefix.vgtest
@@ -1,3 +1,4 @@
+prereq: test -e rep_prefix
prog: rep_prefix
vgopts: --interval-size=100000 --bb-out-file=rep_prefix.out.bb
cleanup: rm rep_prefix.out.bb
