[binutils-gdb] Fix unstable test names in gdb.arch/arc-tdesc-cpu.exp

[Pedro Alves <palves at sourceware dot org>]

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

commit a80e65a9d590f8817e4acd5a62363319b6a1f961
Author: Pedro Alves <palves@redhat.com>
Date:   Tue Oct 24 10:43:33 2017 +0100

    Fix unstable test names in gdb.arch/arc-tdesc-cpu.exp
    
    Currently if you diff testsuite/gdb.sum of two builds built from
    different source trees you see this spurious hunk:
    
      -PASS: gdb.arch/arc-tdesc-cpu.exp: set tdesc filename /home/pedro/gdb1/src/gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml
      +PASS: gdb.arch/arc-tdesc-cpu.exp: set tdesc filename /home/pedro/gdb2/src/gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml
    
    After this commit we'll show this instead in gdb.sum:
      PASS: gdb.arch/arc-tdesc-cpu.exp: set tdesc filename $srcdir/gdb.arch/arc-tdesc-cpu.xml
    
    gdb/testsuite/ChangeLog:
    2017-10-24  Pedro Alves  <palves@redhat.com>
    
    	* gdb.arch/arc-tdesc-cpu.exp ('set tdesc filename'): Use gdb_test
    	with explicit test name.

Diff:
---
 gdb/testsuite/ChangeLog                  | 5 +++++
 gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index de0b7bd..a8c4d81 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-24  Pedro Alves  <palves@redhat.com>
+
+	* gdb.arch/arc-tdesc-cpu.exp ('set tdesc filename'): Use gdb_test
+	with explicit test name.
+
 2017-10-20  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/quit.exp: Use gdb_test_multiple and expect 'eof' before
diff --git a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
index f1c009d..13f677f 100644
--- a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
+++ b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
@@ -26,10 +26,10 @@ gdb_start
 # doesn't pass architecture from the target description directly to the
 # disassembler and instead uses one of the valid CPU names.
 
-set filename $srcdir/$subdir/arc-tdesc-cpu.xml
-
-set cmd "set tdesc filename $filename"
-gdb_test $cmd
+gdb_test \
+    "set tdesc filename $srcdir/$subdir/arc-tdesc-cpu.xml" \
+    ".*" \
+    "set tdesc filename \$srcdir/$subdir/arc-tdesc-cpu.xml"
 
 # An error message is emitted by the disassembler, therefore it is not shown
 # unless the disassembler is actually invoked.  Address "0" is not invalid,