[binutils-gdb] [gdb/testsuite] Handle removed valgrind option --db-attach

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4df46df7a4643c0f6f93a2739c4b7bc0e83bcdce

commit 4df46df7a4643c0f6f93a2739c4b7bc0e83bcdce
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Oct 24 09:49:44 2018 +0200

    [gdb/testsuite] Handle removed valgrind option --db-attach
    
    When running valgrind-db-attach.exp with valgrind version 3.13.0, we get:
    ...
    PASS: gdb.base/valgrind-db-attach.exp: spawn valgrind
    valgrind: Unknown option: --db-attach=yes
    valgrind: Use --help for more information or consult the user manual.
    ERROR: Process no longer exists
    UNRESOLVED: gdb.base/valgrind-db-attach.exp: valgrind started
    ...
    
    The valgrind option --db-attach has been deprecated in version 3.10.0, and
    removed in version 3.11.0.
    
    Fix valgrind-db-attach.exp to replace the ERROR/UNRESOLVED with:
    ...
    UNSUPPORTED: gdb.base/valgrind-db-attach.exp: valgrind started
    ...
    
    Tested on x86_64-linux.
    
    2018-10-24  Tom de Vries  <tdevries@suse.de>
    
    	* gdb.base/valgrind-db-attach.exp: Handle removed support for
    	--db-attach in valgrind.

Diff:
---
 gdb/testsuite/ChangeLog                       | 5 +++++
 gdb/testsuite/gdb.base/valgrind-db-attach.exp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 447578e..99d1e85 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-24  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/valgrind-db-attach.exp: Handle removed support for
+	--db-attach in valgrind.
+
 2018-10-23  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.arch/riscv-reg-aliases.c: New file.
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
index 3be6af5..3e40283 100644
--- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -51,6 +51,10 @@ set use_gdb_stub 1
 set test "valgrind started"
 # The trailing '.' differs for different memcheck versions.
 gdb_test_multiple "" $test {
+    -re "valgrind: Unknown option: --db-attach=yes" {
+	unsupported $test
+	return -1
+    }
     -re "Memcheck, a memory error detector\\.?\r\n" {
 	pass $test
     }