aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.opt/inline-locals.exp26
2 files changed, 27 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba14abb..0588fe6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-19 Tom de Vries <tdevries@suse.de>
+
+ * gdb.opt/inline-locals.exp: Add kfail PR number. Make kfail matching
+ more precise.
+
2020-03-18 Tom de Vries <tdevries@suse.de>
* gdb.dwarf2/break-inline-psymtab-2.c: New test.
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 5871251..3dee0aa 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -43,8 +43,17 @@ if { ! $no_frames } {
"backtrace from bar 2"
gdb_test "up" "#1 .*func1 .* at .*" "up from bar 2"
gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 2"
- setup_kfail "gdb/xyz" *-*-*
- gdb_test "info locals" "array = {.*}" "info locals above bar 2"
+ set pass_re "array = {$decimal, \[^\r\n\]*}"
+ set kfail_re [multi_line $pass_re \
+ "array = {<optimized out> <repeats 64 times>}"]
+ gdb_test_multiple "info locals" "info locals above bar 2" {
+ -re -wrap $pass_re {
+ pass $gdb_test_name
+ }
+ -re -wrap $kfail_re {
+ kfail gdb/25695 $gdb_test_name
+ }
+ }
set msg "info args above bar 2"
gdb_test_multiple "info args" $msg {
@@ -83,8 +92,17 @@ if { ! $no_frames } {
"backtrace from bar 3"
gdb_test "up" "#1 .*func1 .* at .*" "up from bar 3"
gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 3"
- setup_kfail "gdb/xyz" *-*-*
- gdb_test "info locals" "array = {.*}" "info locals above bar 3"
+ set pass_re "array = {$decimal, \[^\r\n\]*}"
+ set kfail_re [multi_line $pass_re \
+ "array = {<optimized out> <repeats 64 times>}"]
+ gdb_test_multiple "info locals" "info locals above bar 2" {
+ -re -wrap $pass_re {
+ pass $gdb_test_name
+ }
+ -re -wrap $kfail_re {
+ kfail gdb/25695 $gdb_test_name
+ }
+ }
set msg "info args above bar 3"
gdb_test_multiple "info args" $msg {