From: Julian Seward <jseward@acm.org>
Date: Tue, 12 Oct 2010 10:14:43 +0000 (+0000)
Subject: Fix up printing of the can't-autodetect-params message and the
X-Git-Tag: svn/VALGRIND_3_6_0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b84460a22e58c42557c08a0cec1e7d153f8e715;p=thirdparty%2Fvalgrind.git

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 e37d0c0a12..28edb57662 100644
--- 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 5920c0501e..ea6d2cd20c 100644
--- 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 973664b240..bb05ceee83 100644
--- 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 af898d46f6..9209dd578b 100755
--- 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 4a7326af60..3114b47208 100755
--- 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"