Fixed cpuid regtest, which was broken by the switch to using the machine's real

CPUID.

Also added filters to Makefiles where missing;  "make regtest" was broken
within distributions created using "make dist", now fixed.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1c6dfc1a2c86d34747852444b6941b414f211e72..0a9f986f018afbb9469df124a03c95b4dd281c1b 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -3,8 +3,9 @@
 ## - lots more mmap/munmap/mremap/mprotect ones
 ##---------------------------------------------------------------------------
 
-noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr \
-                 filter_stderr_backtrace
+noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_mismatches \
+                filter_stderr filter_stderr_backtrace filter_pushfpopf \
+                filter_tronical
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
        badaddrvalue.stderr.exp \

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index fbd7c3b50d91e9ab3065d61b0cf6f5cf4d32132b..65221fee959df95a6494bd0aecb62beea35c5c30 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_SCRIPTS = filter_stderr
+noinst_SCRIPTS = filter_cpuid  filter_none_discards filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
        args.stderr.exp args.stdout.exp args.vgtest \

diff --git a/none/tests/cpuid.stdout.exp b/none/tests/cpuid.stdout.exp
index b38e16463e4e6e8c9d893a4f18931030ba8adfce..0034d0e8c95128d6507b32530fc6806a5d46ed13 100644 (file)
--- a/none/tests/cpuid.stdout.exp
+++ b/none/tests/cpuid.stdout.exp
@@ -1,2 +1,2 @@
-cpuid words (0): 0x1 0x756e6547 0x6c65746e 0x49656e69
-cpuid words (1): 0x52b 0x0 0x0 0x8001bf
+cpuid words (0): 0x........ 0x........ 0x........ 0x........
+cpuid words (1): 0x........ 0x........ 0x........ 0x........

diff --git a/none/tests/cpuid.vgtest b/none/tests/cpuid.vgtest
index 36a2db0e601cdd10564caaa0717c292751cbe092..6eeb2cb325ccbdabb0156ed6923fc5dbbeb88c97 100644 (file)
--- a/none/tests/cpuid.vgtest
+++ b/none/tests/cpuid.vgtest
@@ -1 +1,2 @@
 prog: cpuid
+stdout_filter: filter_cpuid

diff --git a/none/tests/filter_cpuid b/none/tests/filter_cpuid
new file mode 100755 (executable)
index 0000000..a742870
--- /dev/null
+++ b/none/tests/filter_cpuid
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+dir=`dirname $0`
+
+$dir/filter_stderr | $dir/../../tests/filter_addresses
+

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2997a6a78813e73765405c9c305034dbf3b8fc8..ada807be404abf028239e7295ef7eafd0f8978a9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 SUBDIRS = . unused
 
 noinst_SCRIPTS = \
-       vg_regtest
+       vg_regtest \
        filter_addresses \
        filter_discards \
        filter_stderr_basic \