Some more test/build cleanups missed in prior commits.

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

diff --git a/cachegrind/tests/x86/Makefile.am b/cachegrind/tests/x86/Makefile.am
index 3e693bd1a40ccd8a5a968297742aa81a1e9d2fa9..8c8e7e24a794332b24f7470604f544264e52ea17 100644 (file)
--- a/cachegrind/tests/x86/Makefile.am
+++ b/cachegrind/tests/x86/Makefile.am
@@ -1,3 +1,6 @@
+
+include $(top_srcdir)/Makefile.tool-tests.am
+
 noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
@@ -6,7 +9,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
        fpu-28-108
 
-AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g
+
+AM_CFLAGS   += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CCASFLAGS = @FLAG_M32@
 
 fpu_28_108_SOURCES     = fpu-28-108.S

diff --git a/exp-ptrcheck/tests/x86/Makefile.am b/exp-ptrcheck/tests/x86/Makefile.am
index 3532e43d56c68a87c82c229af1e821a4709fa9ef..d697258ba181ac548fad541636b5bc657b202c03 100644 (file)
--- a/exp-ptrcheck/tests/x86/Makefile.am
+++ b/exp-ptrcheck/tests/x86/Makefile.am
@@ -1,4 +1,6 @@
 
+include $(top_srcdir)/Makefile.tool-tests.am
+
 noinst_SCRIPTS = filter_stderr
 
 check_PROGRAMS = asm lea
@@ -7,10 +9,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        asm.vgtest-disabled asm.stderr.exp \
        lea.vgtest-disabled lea.stderr.exp
 
-AM_CPPFLAGS  = -I$(top_srcdir)/include
-AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \
-               $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CXXFLAGS  = $(AM_CFLAGS)
+
+AM_CFLAGS   += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CCASFLAGS = @FLAG_M32@
 
 asm_SOURCES = asm.S

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index f018e68f56e7ef64ab2c025e5de71f847460fca8..dd427c8af7cf23c47cb21bcb3a213d3a92b8e0cd 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        bug137714-x86.stderr.exp bug137714-x86.stdout.exp bug137714-x86.vgtest \
        bug152818-x86.vgtest bug152818-x86.stdout.exp \
        bug152818-x86.stderr.exp \
-       cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \
        cmpxchg8b.stderr.exp cmpxchg8b.stdout.exp cmpxchg8b.vgtest \
+       cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \
        cse_fail.stderr.exp cse_fail.stdout.exp cse_fail.vgtest \
        faultstatus.disabled faultstatus.stderr.exp \
        fcmovnu.vgtest fcmovnu.stderr.exp fcmovnu.stdout.exp \