Fix up printing of the can't-autodetect-params message and the

filtering out thereof, so as to make Cachegrind and Callgrind
pass their regressiont tests on ARM-Linux.

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

diff --git a/cachegrind/cg-arm.c b/cachegrind/cg-arm.c
index e37d0c0a12f4c55616ed88f2b5eb1975eed5e908..28edb5766284ec4947e1434b0d8a9782abe477b8 100644 (file)
--- a/cachegrind/cg-arm.c
+++ b/cachegrind/cg-arm.c
@@ -48,7 +48,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc,
    if (!all_caches_clo_defined) {
       VG_(message)(Vg_DebugMsg, 
                    "Warning: Cannot auto-detect cache config on ARM, using one "
-                   "or more defaults ");
+                   "or more defaults\n");
    }
 }
 

diff --git a/cachegrind/cg-ppc32.c b/cachegrind/cg-ppc32.c
index 5920c0501e0160118af0cc72de0441ec94e491e8..ea6d2cd20c1347a4539d87e8efd951c28fb8269a 100644 (file)
--- a/cachegrind/cg-ppc32.c
+++ b/cachegrind/cg-ppc32.c
@@ -57,7 +57,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc,
    //
    if (!all_caches_clo_defined) {
       VG_(dmsg)("Warning: Cannot auto-detect cache config on PPC32, using one "
-                "or more defaults \n");
+                "or more defaults\n");
    }
 }
 

diff --git a/cachegrind/cg-ppc64.c b/cachegrind/cg-ppc64.c
index 973664b240beca43c2c0b6f7e8ae516f79cd5a79..bb05ceee833fbdf161858de769691b0c85e53ffb 100644 (file)
--- a/cachegrind/cg-ppc64.c
+++ b/cachegrind/cg-ppc64.c
@@ -57,7 +57,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc,
    //
    if (!all_caches_clo_defined) {
       VG_(dmsg)("Warning: Cannot auto-detect cache config on PPC64, using one "
-                "or more defaults \n");
+                "or more defaults\n");
    }
 }
 

diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr
index af898d46f60a530637e8cf3021856765522859d7..9209dd578b295b4d712554033371d55c3de96fbb 100755 (executable)
--- a/cachegrind/tests/filter_stderr
+++ b/cachegrind/tests/filter_stderr
@@ -17,4 +17,5 @@ perl -p -e 's/((I1|D1|LL|LLi|LLd) *(misses|miss rate):)[ 0-9,()+rdw%\.]*$/\1/' |
 sed "/warning: Pentium 4 with 12 KB micro-op instruction trace cache/d" |
 sed "/Simulating a 16 KB I-cache with 32 B lines/d"   |
 sed "/warning: L3 cache found, using its data for the LL simulation./d" |
-sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d"
+sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d" |
+sed "/Warning: Cannot auto-detect cache config on ARM, using one or more defaults/d"

diff --git a/callgrind/tests/filter_stderr b/callgrind/tests/filter_stderr
index 4a7326af60bc1e5e6e452f34e459c3393b04043f..3114b47208fb3f142d7f4dd27d46ac6fd0386ce4 100755 (executable)
--- a/callgrind/tests/filter_stderr
+++ b/callgrind/tests/filter_stderr
@@ -26,4 +26,5 @@ perl -p -e 's/((Branches|Mispredicts|Mispred rate):)[ 0-9,()+condi%\.]*$/\1/' |
 sed "/warning: Pentium 4 with 12 KB micro-op instruction trace cache/d" |
 sed "/Simulating a 16 KB I-cache with 32 B lines/d"   |
 sed "/warning: L3 cache found, using its data for the LL simulation./d" |
-sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d"
+sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d" |
+sed "/Warning: Cannot auto-detect cache config on ARM, using one or more defaults/d"