Fixes for #110657, based on Jakub Jelinek's patch:

- filter out L3 warning messages so they don't break Cachegrind's regtests
- handle lack of mq support gracefully in mq.c

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

diff --git a/cachegrind/cg-x86.c b/cachegrind/cg-x86.c
index b0bd3af48d754d0772b59c531b178612522bc98b..a76ea7f9fbfec1e185eb7647b9627b48190a0761 100644 (file)
--- a/cachegrind/cg-x86.c
+++ b/cachegrind/cg-x86.c
@@ -108,8 +108,7 @@ Int Intel_cache_info(Int level, cache_t* I1c, cache_t* D1c, cache_t* L2c)
          VG_(tool_panic)("IA-64 cache detected?!");
 
       case 0x22: case 0x23: case 0x25: case 0x29: 
-          VG_(message)(Vg_DebugMsg, 
-             "warning: L3 cache detected but ignored\n");
+          VG_(message)(Vg_DebugMsg, "warning: L3 cache detected but ignored");
           break;
 
       /* These are sectored, whatever that means */

diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr
index 318c8ca11a010a74f6abff4c8ffb8b9f0b95580d..81fc8486dedd6eb37bf69e0e0418fc47f6f3540d 100755 (executable)
--- a/cachegrind/tests/filter_stderr
+++ b/cachegrind/tests/filter_stderr
@@ -13,7 +13,7 @@ sed "s/\(\(I\|D\|L2\) *refs:\)[ 0-9,()+rdw]*$/\1/"  |
 # Remove numbers from I1/D1/L2/L2i/L2d "misses:" and "miss rates:" lines
 sed "s/\(\(I1\|D1\|L2\|L2i\|L2d\) *\(misses\|miss rate\):\)[ 0-9,()+rdw%\.]*$/\1/" |
 
-# Remove warnings lines for P4s:
+# Remove CPUID warnings lines for P4s and other machines
 sed "/warning: Pentium with 12 K micro-op instruction trace cache/d" |
-sed "/Simulating a 16 KB cache with 32 B lines/d"
-
+sed "/Simulating a 16 KB cache with 32 B lines/d"   |
+sed "/warning: L3 cache detected but ignored/d"

diff --git a/none/tests/mq.c b/none/tests/mq.c
index 2e7cf209b8476b566e0c7ba6c4ed6a8403215ff3..a731ad87d127b64e75599a09154afbe93f85521d 100644 (file)
--- a/none/tests/mq.c
+++ b/none/tests/mq.c
@@ -24,6 +24,8 @@ int main(int argc, char **argv)
   
   if ((mqdw = mq_open("/valgrind-mqueue", O_CREAT|O_EXCL|O_WRONLY, 0600, &mqa)) < 0)
     {
+      if (errno == ENOSYS)
+        exit(0);
       perror("mq_open");
       exit(1);
     }