From d64aeaa5c026ad8b108bcb972fa3581005c50ff8 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Oct 13 2012 14:22:14 +0000
Subject: Add valgrind-3.8.1-filter_gdb.patch (KDE#308321)


---

diff --git a/valgrind-3.8.1-gdbserver_tests-sleeper.patch b/valgrind-3.8.1-gdbserver_tests-sleeper.patch
new file mode 100644
index 0000000..5715ca9
--- /dev/null
+++ b/valgrind-3.8.1-gdbserver_tests-sleeper.patch
@@ -0,0 +1,11 @@
+--- valgrind/gdbserver_tests/mcinvokeWS.vgtest	(revision 12997)
++++ valgrind/gdbserver_tests/mcinvokeWS.vgtest	(working copy)
+@@ -1,7 +1,7 @@
+ # test that vgdb can invoke a process when all threads are in WaitSys mode.
+ # If the test goes wrong, it might be blocked during 10000 seconds.
+ prog: sleepers
+-args: 1 10000000 0 -S-S-S-S
++args: 1 10000 0 -S-S-S-S
+ vgopts: --tool=memcheck --vgdb=yes --vgdb-prefix=./vgdb-prefix-mcinvokeWS
+ stderr_filter: filter_make_empty
+ prereq: test -f vgdb.ptraceinvoker
diff --git a/valgrind.spec b/valgrind.spec
index a684be0..f26626e 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -108,6 +108,9 @@ Patch23: valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch
 # vgtest files should prereq that the binary is there (for old binutils).
 Patch24: valgrind-3.8.1-avx2-prereq.patch
 
+# KDE#308321 - testsuite memcheck filter interferes with gdb_filter
+Patch25: valgrind-3.8.1-filter_gdb.patch
+
 
 Obsoletes: valgrind-callgrind
 %ifarch x86_64 ppc64
@@ -231,6 +234,8 @@ touch ./none/tests/amd64/bmi.stderr.exp
 %patch23 -p1
 %patch24 -p1
 
+%patch25 -p1
+
 %build
 # We need to use the software collection compiler and binutils if available.
 # The configure checks might otherwise miss support for various newer
@@ -356,13 +361,14 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
-* Thu Oct 04 2012 Mark Wielaard <mjw@redhat.com>
+* Sat Oct 13 2012 Mark Wielaard <mjw@redhat.com>
 - Add valgrind-3.8.1-x86_amd64_features-avx.patch (KDE#307285)
 - Add valgrind-3.8.1-gdbserver_tests-syscall-template-source.patch (KDE#307155)
 - Add valgrind-3.8.1-overlap_memcpy_filter.patch (KDE#307290)
 - Add valgrind-3.8.1-pkg-config.patch (#827219, KDE#307729)
 - Add valgrind-3.8.1-proc-auxv.patch (KDE#253519)
 - Add valgrind-3.8.1-wcs.patch (#755242, KDE#307828)
+- Add valgrind-3.8.1-filter_gdb.patch (KDE#308321)
 
 * Fri Sep 20 2012 Mark Wielaard <mjw@redhat.com> 3.8.1-2
 - Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch