[Valgrind-developers] valgrind: r11433 - in trunk: cachegrind cachegrind/tests callgrind/tests

[<sv...@va...>]

Author: sewardj
Date: 2010-10-12 11:14:43 +0100 (Tue, 12 Oct 2010)
New Revision: 11433

Log:
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.


Modified:
   trunk/cachegrind/cg-arm.c
   trunk/cachegrind/cg-ppc32.c
   trunk/cachegrind/cg-ppc64.c
   trunk/cachegrind/tests/filter_stderr
   trunk/callgrind/tests/filter_stderr


Modified: trunk/cachegrind/cg-arm.c
===================================================================
--- trunk/cachegrind/cg-arm.c	2010-10-12 10:13:17 UTC (rev 11432)
+++ trunk/cachegrind/cg-arm.c	2010-10-12 10:14:43 UTC (rev 11433)
@@ -48,7 +48,7 @@
    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");
    }
 }
 

Modified: trunk/cachegrind/cg-ppc32.c
===================================================================
--- trunk/cachegrind/cg-ppc32.c	2010-10-12 10:13:17 UTC (rev 11432)
+++ trunk/cachegrind/cg-ppc32.c	2010-10-12 10:14:43 UTC (rev 11433)
@@ -57,7 +57,7 @@
    //
    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");
    }
 }
 

Modified: trunk/cachegrind/cg-ppc64.c
===================================================================
--- trunk/cachegrind/cg-ppc64.c	2010-10-12 10:13:17 UTC (rev 11432)
+++ trunk/cachegrind/cg-ppc64.c	2010-10-12 10:14:43 UTC (rev 11433)
@@ -57,7 +57,7 @@
    //
    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");
    }
 }
 

Modified: trunk/cachegrind/tests/filter_stderr
===================================================================
--- trunk/cachegrind/tests/filter_stderr	2010-10-12 10:13:17 UTC (rev 11432)
+++ trunk/cachegrind/tests/filter_stderr	2010-10-12 10:14:43 UTC (rev 11433)
@@ -17,4 +17,5 @@
 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"

Modified: trunk/callgrind/tests/filter_stderr
===================================================================
--- trunk/callgrind/tests/filter_stderr	2010-10-12 10:13:17 UTC (rev 11432)
+++ trunk/callgrind/tests/filter_stderr	2010-10-12 10:14:43 UTC (rev 11433)
@@ -26,4 +26,5 @@
 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"