[committed][gdb/testsuite] Fix info-var.exp for debug info from other files

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

[was: Re: [PATCH 1/7] gdb: Add new -n flag to some info commands ]
On 27-08-19 17:27, Andrew Burgess wrote:
> * Eli Zaretskii <eliz@gnu.org> [2019-08-26 19:18:53 +0300]:
> 
>>> Date: Mon, 26 Aug 2019 16:52:00 +0100
>>> From: Andrew Burgess <andrew.burgess@embecosm.com>
>>> Cc: gdb-patches@sourceware.org, Richard.Bunt@arm.com
>>>
>>> +  ** The "info variables", "info functions", and "whereis" commands
>>> +     now take a '-n' flag that excludes non-debug symbols (symbols
>>> +     from the symbol table, not from the debug info such as DWARf)
>>                                                                    ^
>> A typo.
>>
>> Other than that, the documentation parts are OK.
>>
>> Thanks.
> 
> Thanks,
> 
> This patch is now pushed.
> 

I've committed this fixup for openSUSE Leap.

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-testsuite-Fix-info-var.exp-for-debug-info-from-other-files.patch --]
[-- Type: text/x-patch, Size: 1563 bytes --]

[gdb/testsuite] Fix info-var.exp for debug info from other files

On openSUSE Leap 15.1, I get:
...
FAIL: gdb.base/info-var.exp: info variables
FAIL: gdb.base/info-var.exp: info variables -n
...
because the info variables command prints info also for init.c:
...
File init.c:^M
24:     const int _IO_stdin_used;^M
...
while the regexps in the test-case only expect info for info-var-f1.c and
info-var-f2.c.

Fix this by extending the regexps.

Tested on x86_64-linux, both openSUSE Leap 15.1 and Fedora 30.

gdb/testsuite/ChangeLog:

2019-08-28  Tom de Vries  <tdevries@suse.de>

	* gdb.base/info-var.exp: Allow info variables to print info for files
	other than info-var-f1.c and info-var-f2.c.

---
 gdb/testsuite/gdb.base/info-var.exp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/info-var.exp b/gdb/testsuite/gdb.base/info-var.exp
index 5a07d6214d..6dd896d8aa 100644
--- a/gdb/testsuite/gdb.base/info-var.exp
+++ b/gdb/testsuite/gdb.base/info-var.exp
@@ -37,7 +37,10 @@ gdb_test "info variables" \
 	 "File .*${srcfile2}:" \
 	 "18:\[ \t\]+int global_var;" \
 	 "20:\[ \t\]+static int f2_var;" \
-	 "" \
+	 "(" \
+	 "File .*:(" \
+	 "$decimal:.*" \
+	 ")+)*" \
 	 "Non-debugging symbols:" \
 	 ".*"]
 
@@ -50,7 +53,10 @@ gdb_test "info variables -n" \
 	 "" \
 	 "File .*${srcfile2}:" \
 	 "18:\[ \t\]+int global_var;" \
-	 "20:\[ \t\]+static int f2_var;" ]
+	 "20:\[ \t\]+static int f2_var;(" \
+	 "" \
+	 "File .*:(" \
+	 "$decimal:.*)+)*"]
 
 gdb_test "info variables -n global" \
     [multi_line \