Properly guard exp-bbv/tests/x86/ on OS X. Partial fix for BZ#344416 (at least reduce...

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

diff --git a/exp-bbv/tests/Makefile.am b/exp-bbv/tests/Makefile.am
index 359ba22b4a024151c722526ad98ff1f4edd40618..5261cee8ed65f6761f044394c76e827862e1c86d 100644 (file)
--- a/exp-bbv/tests/Makefile.am
+++ b/exp-bbv/tests/Makefile.am
@@ -5,8 +5,10 @@ SUBDIRS = .
 
 # 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 ef5ac30b5f8fd235674aa477d3138b994fc28bc1..506a1e8ce0a70e95a42db08ba02872bf1fe99c38 100644 (file)
--- 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 f9bbae91bec80e1d34af952a8cf0345f2a59ca61..d030ddbaf914d366d7e4c44aab54d782a64fba6a 100644 (file)
--- 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 fc91c77e4d109a48fafd6cb9e78a6e202df28ece..3ce2fb5d4567ef9e243d16e47205258bdb8d4c81 100644 (file)
--- 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 bc89a1c25113a3048d8dd6f02233b31b0039409a..aa8b7d35f728f8c26b67496f4be1c05706bdc861 100644 (file)
--- 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