From: Tom de Vries <tdevries@suse.de>
Date: Wed, 28 Oct 2020 09:01:32 +0000 (+0100)
Subject: [gdb/testsuite] Fix gdb.dwarf2/dw2-stack-boundary.exp with -readnow
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=706baf4c504053887add26bb8b7789ea28c64491;p=binutils-gdb.git

[gdb/testsuite] Fix gdb.dwarf2/dw2-stack-boundary.exp with -readnow

When running test-case gdb.dwarf2/dw2-stack-boundary.exp with target board
readnow, we run into:
...
FAIL: gdb.dwarf2/dw2-stack-boundary.exp: check partial symtab errors
...

The cause for the FAIL is that these complaints are not there:
...
During symbol reading: location description stack underflow^M
During symbol reading: location description stack overflow^M
...

Fix this by KFAILing the complaints for -readnow.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-10-28  Tom de Vries  <tdevries@suse.de>

	* gdb.dwarf2/dw2-stack-boundary.exp: KFAILing the complaints for
	-readnow.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ffbc01dde63..20555ec4646 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-28  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.dwarf2/dw2-stack-boundary.exp: KFAILing the complaints for
+	-readnow.
+
 2020-10-27  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/multi-forks.exp: Use exp_continue to fix timeout.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
index 6971cbc4bd1..d946679e548 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
@@ -38,7 +38,31 @@ if [is_remote host] {
     }
 }
 gdb_test_no_output "set complaints 100"
-gdb_test "file $binfile" {Reading symbols from .*\.\.\.\r\nDuring symbol reading: location description stack underflow\r\nDuring symbol reading: location description stack overflow} "check partial symtab errors"
+set w1 0
+set w2 0
+gdb_test_multiple "file $binfile" "file command" {
+    -re "\r\nReading symbols from \[^\r\n\]*\\.\\.\\." {
+	exp_continue
+    }
+    -re "\r\nDuring symbol reading: location description stack underflow" {
+	set w1 1
+	exp_continue
+    }
+    -re "\r\nDuring symbol reading: location description stack overflow" {
+	set w2 1
+	exp_continue
+    }
+    -re -wrap "" {
+	pass $gdb_test_name
+    }
+}
+
+set readnow_p [readnow]
+
+if { $readnow_p } {
+    setup_kfail "gdb/26796" *-*-*
+}
+gdb_assert {$w1 && $w2}
 
 gdb_test "p underflow" {Asked for position 0 of stack, stack only has 0 elements on it\.}
 gdb_test "p overflow" " = 2"