|
From: <sv...@va...> - 2005-08-19 00:21:42
|
Author: dirk
Date: 2005-08-19 01:21:03 +0100 (Fri, 19 Aug 2005)
New Revision: 4458
Log:
merge: fix regression tests
Modified:
branches/VALGRIND_3_0_BRANCH/cachegrind/cg-x86.c
branches/VALGRIND_3_0_BRANCH/cachegrind/tests/filter_stderr
branches/VALGRIND_3_0_BRANCH/none/tests/mq.c
Modified: branches/VALGRIND_3_0_BRANCH/cachegrind/cg-x86.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_0_BRANCH/cachegrind/cg-x86.c 2005-08-19 00:18:26 =
UTC (rev 4457)
+++ branches/VALGRIND_3_0_BRANCH/cachegrind/cg-x86.c 2005-08-19 00:21:03 =
UTC (rev 4458)
@@ -108,8 +108,7 @@
VG_(tool_panic)("IA-64 cache detected?!");
=20
case 0x22: case 0x23: case 0x25: case 0x29:=20
- VG_(message)(Vg_DebugMsg,=20
- "warning: L3 cache detected but ignored\n");
+ VG_(message)(Vg_DebugMsg, "warning: L3 cache detected but igno=
red");
break;
=20
/* These are sectored, whatever that means */
Modified: branches/VALGRIND_3_0_BRANCH/cachegrind/tests/filter_stderr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_0_BRANCH/cachegrind/tests/filter_stderr 2005-08-1=
9 00:18:26 UTC (rev 4457)
+++ branches/VALGRIND_3_0_BRANCH/cachegrind/tests/filter_stderr 2005-08-1=
9 00:21:03 UTC (rev 4458)
@@ -13,7 +13,7 @@
# 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/" |
=20
-# 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"
Modified: branches/VALGRIND_3_0_BRANCH/none/tests/mq.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_0_BRANCH/none/tests/mq.c 2005-08-19 00:18:26 UTC =
(rev 4457)
+++ branches/VALGRIND_3_0_BRANCH/none/tests/mq.c 2005-08-19 00:21:03 UTC =
(rev 4458)
@@ -24,6 +24,8 @@
=20
if ((mqdw =3D mq_open("/valgrind-mqueue", O_CREAT|O_EXCL|O_WRONLY, 060=
0, &mqa)) < 0)
{
+ if (errno =3D=3D ENOSYS)
+ exit(0);
perror("mq_open");
exit(1);
}
|