Partial fix for bz#344416 - Fix make regtest does not work cleanly on OS X.

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

diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index 7e943abe45ea41e274386b57a0b6784956a112c9..4d2bcbd252a0b00b2e964219991f48bc00242edc 100644 (file)
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -135,9 +135,6 @@ endif
 if BUILD_FMA_TESTS
  check_PROGRAMS += fma
 endif
-if BUILD_MOVBE_TESTS
- check_PROGRAMS += movbe
-endif
 if BUILD_MPX_TESTS
  check_PROGRAMS += mpx
 endif
@@ -157,6 +154,9 @@ if ! VGCONF_OS_IS_DARWIN
 if BUILD_LOOPNEL_TESTS
    check_PROGRAMS += loopnel
 endif
+if BUILD_MOVBE_TESTS
+   check_PROGRAMS += movbe
+endif
 endif
 
 AM_CFLAGS    += @FLAG_M64@

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index f9632efb526a6a514c517a061b67f12441b9ac76..82ac3f9d54b1908d3d9800d04cb6f93a2ca57195 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -111,14 +111,14 @@ if BUILD_LZCNT_TESTS
  check_PROGRAMS += lzcnt32
 endif
 if !VGCONF_OS_IS_DARWIN
+if BUILD_MOVBE_TESTS
+   check_PROGRAMS += movbe
+endif
 if !SOLARIS_SUN_STUDIO_AS
 # Sun Studio assembler fails to assemble the bound instruction
  check_PROGRAMS += faultstatus
 endif
 endif
-if BUILD_MOVBE_TESTS
- check_PROGRAMS += movbe
-endif
 if !SOLARIS_SUN_STUDIO_AS
 # Sun Studio assembler fails to assemble pushw %fs, popw %fs
  check_PROGRAMS += pushpopseg