3.15.0-0.3.RC1

- Enable full regtest on all fedora arches.
- Make sure that patched a.c is not newer than cgout-test.
- Update valgrind-3.15.0-gdb-output1.patch to upstream version.
- Add valgrind-3.15.0-filter-libc-futex.patch.
- Add valgrind-3.15.0-mmap-32bit.patch.
This commit is contained in:
Mark Wielaard 2019-04-11 01:23:44 +02:00
parent dd23d3ef80
commit 375230e95f
4 changed files with 112 additions and 35 deletions

View File

@ -0,0 +1,13 @@
diff --git a/tests/filter_libc b/tests/filter_libc
index 9607db5..8eb9911 100755
--- a/tests/filter_libc
+++ b/tests/filter_libc
@@ -37,6 +37,8 @@ while (<>)
s/(at.*)operator delete\[\]\(void\*\)/$1...operator delete[].../;
# Some glibc versions complain about unexpected futex syscall errors.
+ # With or without newline (see sourceware PR20271).
+ next if /^The futex facility returned an unexpected error code.$/;
s/The futex facility returned an unexpected error code.//;
print;

View File

@ -1,32 +1,63 @@
From 97df7b924435c5f7f576972dc924f2c29105edb3 Mon Sep 17 00:00:00 2001 commit 12addd06445a1685e91ff091867ae27d6eac733f
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com> Author: Alexandra Hájková <ahajkova@redhat.com>
Date: Tue, 9 Apr 2019 11:09:56 +0200 Date: Tue Apr 9 11:09:56 2019 +0200
Subject: [PATCH] gdbserver_tests: adjust filtering for the new gdb output
mcsigpass and mcsignopass tests fails due to the slightly different gdbserver_tests: adjust filtering for the new gdb output
gdb output. Filter the tests output to make it the same for different
gdb version. Change mcsigpass and mcsignopass .exp to fit filtered mcsigpass and mcsignopass tests fails due to the slightly different
.out. gdb output. Filter the tests output to make it the same for different
--- gdb version. Change mcsigpass and mcsignopass .exp to fit filtered
gdbserver_tests/filter_gdb | 1 + .out.
gdbserver_tests/mcsignopass.stdoutB.exp | 24 ++++++++++++------------
gdbserver_tests/mcsigpass.stdoutB.exp | 6 +++--- More generic regexp by Stefan Maksimovic <stefan.maksimovic@rt-rk.com>.
3 files changed, 16 insertions(+), 15 deletions(-)
https://bugs.kde.org/show_bug.cgi?id=406355
diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
index 05bbe4c54..7e6092dd0 100755 index 05bbe4c..947e7bc 100755
--- a/gdbserver_tests/filter_gdb --- a/gdbserver_tests/filter_gdb
+++ b/gdbserver_tests/filter_gdb +++ b/gdbserver_tests/filter_gdb
@@ -139,6 +139,7 @@ sed -e '/Remote debugging using/,/vgdb launched process attached/d' @@ -139,6 +139,7 @@ sed -e '/Remote debugging using/,/vgdb launched process attached/d'
-e 's/VgTs_WaitSys) 0x/VgTs_WaitSys) 0x/' \ -e 's/VgTs_WaitSys) 0x/VgTs_WaitSys) 0x/' \
-e '/Cannot access memory at address 0x......../d' \ -e '/Cannot access memory at address 0x......../d' \
-e '/\[New Thread/d' \ -e '/\[New Thread/d' \
+ -e 's/0x........ in test/test/' \ + -e 's/^0x........ in \(\w\+ (\)/\1/' \
-e '/^$/d' | -e '/^$/d' |
# remove all the lines telling where the SIGFPE was trapped. # remove all the lines telling where the SIGFPE was trapped.
diff --git a/gdbserver_tests/mcbreak.stdoutB.exp b/gdbserver_tests/mcbreak.stdoutB.exp
index ba526da..7559037 100644
--- a/gdbserver_tests/mcbreak.stdoutB.exp
+++ b/gdbserver_tests/mcbreak.stdoutB.exp
@@ -43,11 +43,11 @@ Breakpoint 3, main (argc=1, argv=0x........) at t.c:120
Delete all breakpoints? (y or n) [answered Y; input not from terminal]
Continuing.
Program received signal SIGTRAP, Trace/breakpoint trap.
-0x........ in make_error (s=0x........ "called from level") at t.c:41
+make_error (s=0x........ "called from level") at t.c:41
41 if (int_und == 0)
44 printf ("%s int_und is not zero\n", s);
old_pc has changed after step
Continuing.
Program received signal SIGTRAP, Trace/breakpoint trap.
-0x........ in make_error (s=0x........ "called from main") at t.c:41
+make_error (s=0x........ "called from main") at t.c:41
41 if (int_und == 0)
diff --git a/gdbserver_tests/mcinfcallWSRU.stderrB.exp b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
index a2f2b87..06dc433 100644
--- a/gdbserver_tests/mcinfcallWSRU.stderrB.exp
+++ b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
@@ -14,7 +14,7 @@ Breakpoint 1, sleeper_or_burner (v=0x........) at sleepers.c:74
74 int i = 0;
Continuing.
Program received signal SIGTRAP, Trace/breakpoint trap.
-0x........ in do_burn () at sleepers.c:41
+do_burn () at sleepers.c:41
41 for (i = 0; i < burn; i++) loopnr++;
[Switching to thread 1 (Thread ....)]
#0 0x........ in do_burn ()
diff --git a/gdbserver_tests/mcsignopass.stdoutB.exp b/gdbserver_tests/mcsignopass.stdoutB.exp diff --git a/gdbserver_tests/mcsignopass.stdoutB.exp b/gdbserver_tests/mcsignopass.stdoutB.exp
index d77f9832a..18c830be6 100644 index d77f983..18c830b 100644
--- a/gdbserver_tests/mcsignopass.stdoutB.exp --- a/gdbserver_tests/mcsignopass.stdoutB.exp
+++ b/gdbserver_tests/mcsignopass.stdoutB.exp +++ b/gdbserver_tests/mcsignopass.stdoutB.exp
@@ -6,54 +6,54 @@ Signal Stop Print Pass to program Description @@ -6,54 +6,54 @@ Signal Stop Print Pass to program Description
@ -97,7 +128,7 @@ index d77f9832a..18c830be6 100644
Continuing. Continuing.
Program received signal SIGFPE, Arithmetic exception. Program received signal SIGFPE, Arithmetic exception.
diff --git a/gdbserver_tests/mcsigpass.stdoutB.exp b/gdbserver_tests/mcsigpass.stdoutB.exp diff --git a/gdbserver_tests/mcsigpass.stdoutB.exp b/gdbserver_tests/mcsigpass.stdoutB.exp
index de6c2634f..680035836 100644 index de6c263..6800358 100644
--- a/gdbserver_tests/mcsigpass.stdoutB.exp --- a/gdbserver_tests/mcsigpass.stdoutB.exp
+++ b/gdbserver_tests/mcsigpass.stdoutB.exp +++ b/gdbserver_tests/mcsigpass.stdoutB.exp
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
@ -118,6 +149,16 @@ index de6c2634f..680035836 100644
126 mapping[FILESIZE+10]; 126 mapping[FILESIZE+10];
Continuing. Continuing.
Program received signal SIGFPE, Arithmetic exception. Program received signal SIGFPE, Arithmetic exception.
-- diff --git a/gdbserver_tests/nlcontrolc.stdoutB.exp b/gdbserver_tests/nlcontrolc.stdoutB.exp
2.17.2 index e334fd0..e8a5ff8 100644
--- a/gdbserver_tests/nlcontrolc.stdoutB.exp
+++ b/gdbserver_tests/nlcontrolc.stdoutB.exp
@@ -9,7 +9,7 @@ $4 = 0
changed burning parameters
Continuing.
Program received signal SIGTRAP, Trace/breakpoint trap.
-0x........ in do_burn () at sleepers.c:41
+do_burn () at sleepers.c:41
41 for (i = 0; i < burn; i++) loopnr++;
$5 = 0
$6 = 0

View File

@ -0,0 +1,11 @@
diff --git a/none/tests/amd64-linux/map_32bits.vgtest b/none/tests/amd64-linux/map_32bits.vgtest
index 2b7f3a0..2c17854 100644
--- a/none/tests/amd64-linux/map_32bits.vgtest
+++ b/none/tests/amd64-linux/map_32bits.vgtest
@@ -1,5 +1,5 @@
prog: map_32bits
# take a big aspacemgr minaddr, to quickly reach the 2GB limit
-vgopts: -q --aspace-minaddr=0x7ff60000
+vgopts: -q --aspace-minaddr=0x70000000
stderr_filter: filter_stderr

View File

@ -3,7 +3,7 @@
Summary: Tool for finding memory management bugs in programs Summary: Tool for finding memory management bugs in programs
Name: %{?scl_prefix}valgrind Name: %{?scl_prefix}valgrind
Version: 3.15.0 Version: 3.15.0
Release: 0.2.RC1%{?dist} Release: 0.3.RC1%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
URL: http://www.valgrind.org/ URL: http://www.valgrind.org/
@ -43,22 +43,17 @@ URL: http://www.valgrind.org/
# Whether to run the full regtest or only a limited set # Whether to run the full regtest or only a limited set
# The full regtest includes gdb_server integration tests # The full regtest includes gdb_server integration tests
# and experimental tools. # and experimental tools.
# Only run full regtests on x86_64, but not on older rhel # Only run full regtests on fedora, but not on older rhel
# or when creating scl, the gdb_server tests might hang. # or when creating scl, the gdb_server tests might hang.
%ifarch x86_64 %if %{is_scl}
%if %{is_scl}
%global run_full_regtest 0
%else
%if 0%{?fedora}
# Current rawhide gdb just crashes
%global run_full_regtest 0
%endif
%if 0%{?rhel}
%global run_full_regtest (%rhel >= 7)
%endif
%endif
%else
%global run_full_regtest 0 %global run_full_regtest 0
%else
%if 0%{?fedora}
%global run_full_regtest 1
%endif
%if 0%{?rhel}
%global run_full_regtest (%rhel >= 7)
%endif
%endif %endif
# Generating minisymtabs doesn't really work for the staticly linked # Generating minisymtabs doesn't really work for the staticly linked
@ -103,6 +98,12 @@ Patch9: valgrind-3.15.0-gdb-output1.patch
# KDE#406357 RC1 fails gdbserver_tests because of gdb output change # KDE#406357 RC1 fails gdbserver_tests because of gdb output change
Patch10: valgrind-3.15.0-gdb-output2.patch Patch10: valgrind-3.15.0-gdb-output2.patch
# KDE#405205 filter_libc: remove the futex syscall error line entirely
Patch11: valgrind-3.15.0-filter-libc-futex.patch
# KDE#406422 none/tests/amd64-linux/map_32bits.vgtest fails too easily
Patch12: valgrind-3.15.0-mmap-32bit.patch
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15
BuildRequires: glibc-devel >= 2.14 BuildRequires: glibc-devel >= 2.14
@ -237,10 +238,14 @@ Valgrind User Manual for details.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
# a.c cannot be "newer" than cgout-test
touch cachegrind/tests/cgout-test
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch12 -p1
%build %build
CC=gcc CC=gcc
@ -453,6 +458,13 @@ fi
%endif %endif
%changelog %changelog
* Wed Apr 10 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.3.RC1
- Enable full regtest on all fedora arches.
- Make sure that patched a.c is not newer than cgout-test.
- Update valgrind-3.15.0-gdb-output1.patch to upstream version.
- Add valgrind-3.15.0-filter-libc-futex.patch.
- Add valgrind-3.15.0-mmap-32bit.patch.
* Tue Apr 9 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.2.RC1 * Tue Apr 9 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.2.RC1
- Add valgrind-3.15.0-s390x-get-startregs-constraint.patch - Add valgrind-3.15.0-s390x-get-startregs-constraint.patch
- Add valgrind-3.15.0-missing-a-c.patch - Add valgrind-3.15.0-missing-a-c.patch