From d24bc684a255dd06cd00dafed8088b0f4ae0a36d Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Fri, 21 Sep 2012 12:10:47 +0200
Subject: [PATCH] Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch

On some ppc64 installs these test just hangs
---
 ...3.8.1-gdbserver_tests-mcinvoke-ppc64.patch | 25 +++++++++++++++++++
 valgrind.spec                                 |  7 ++++++
 2 files changed, 32 insertions(+)
 create mode 100644 valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch

diff --git a/valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch b/valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
new file mode 100644
index 0000000..9e6c3c9
--- /dev/null
+++ b/valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
@@ -0,0 +1,25 @@
+--- valgrind/gdbserver_tests/mcinvokeWS.vgtest	(revision 12990)
++++ valgrind/gdbserver_tests/mcinvokeWS.vgtest	(working copy)
+@@ -4,7 +4,8 @@
+ args: 1 10000000 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
++# One some ppc64 installs this test just hangs
++prereq: test -f vgdb.ptraceinvoker && ! `../tests/arch_test ppc64`
+ progB: invoker
+ argsB: 10 --vgdb-prefix=./vgdb-prefix-mcinvokeWS --wait=60 -c v.wait 0
+ # if the --wait is not enough, the test will fail or block
+Index: gdbserver_tests/mcinvokeRU.vgtest
+===================================================================
+--- valgrind/gdbserver_tests/mcinvokeRU.vgtest	(revision 12990)
++++ valgrind/gdbserver_tests/mcinvokeRU.vgtest	(working copy)
+@@ -7,6 +7,8 @@
+ # as the Valgrind process is always busy, we do not need the vgdb.ptraceinvoker prereq.
+ # We even disable ptrace invoker to avoid spurious attach error message
+ # on kernels where ptrace is restricted.
++# One some ppc64 installs this test just hangs
++prereq: ! `../tests/arch_test ppc64`
+ progB: invoker
+ argsB: 10 --vgdb-prefix=./vgdb-prefix-mcinvokeRU --max-invoke-ms=0 --wait=60 -c v.wait 0
+ # if the --wait is not enough, the test will fail or block.
diff --git a/valgrind.spec b/valgrind.spec
index 817a119..a75be86 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -52,6 +52,9 @@ Patch12: valgrind-3.8.1-abbrev-parsing.patch
 # KDE#307038 - DWARF2 CFI reader: unhandled DW_OP_ opcode 0x8 (DW_OP_const1u) 
 Patch13: valgrind-3.8.1-cfi_dw_ops.patch
 
+# On some ppc64 installs these test just hangs
+Patch14: valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
+
 
 # KDE#305728 - Add support for AVX2, BMI1, BMI2 and FMA instructions 
 # Combined patch for:
@@ -188,6 +191,7 @@ for details.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # Add support for AVX2, BMI1, BMI2 and FMA instructions
 %patch21 -p1
@@ -323,6 +327,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Fri Sep 20 2012 Mark Wielaard <mjw@redhat.com>
+- Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
+
 * Thu Sep 20 2012 Mark Wielaard <mjw@redhat.com> 3.8.1-1
 - Add partial backport of upstream revision 12884
   valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch