From 48352473b1d2c213749a324f392cf8ec53d273a6 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 28 Aug 2019 19:13:29 +0200 Subject: [PATCH] [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 * 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/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/info-var.exp | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3939a747c5b..06ee15c97ae 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-28 Tom de Vries + + * gdb.base/info-var.exp: Allow info variables to print info for files + other than info-var-f1.c and info-var-f2.c. + 2019-08-28 Andrew Burgess * gdb.fortran/info-types.exp: Add module. diff --git a/gdb/testsuite/gdb.base/info-var.exp b/gdb/testsuite/gdb.base/info-var.exp index 5a07d6214da..6dd896d8aa7 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 \ -- 2.30.2