From: Yao Qi <yao@codesourcery.com>
Date: Tue, 6 May 2014 13:47:36 +0000 (+0800)
Subject: Relax the pattern in dwzbuildid.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e45f04cf3408e662c460a23a3722fedfb03391a;p=binutils-gdb.git

Relax the pattern in dwzbuildid.exp

Hi,
I recently see the fail in dwzbuildid.exp below on some targets,

(gdb) print the_int
No symbol "the_int" in current context.
(gdb) FAIL: gdb.dwarf2/dwzbuildid.exp: mismatch: print the_int

Looks the pattern expects to see "No symbol table is loaded", which
is emitted in c-exp.y,

variable:       name_not_typename
....
                              if (msymbol.minsym != NULL)
                                write_exp_msymbol (pstate, msymbol);
                              else if (!have_full_symbols () && !have_partial_symbols ())
                                error (_("No symbol table is loaded.  Use the \"file\" command."));
                              else
                                error (_("No symbol \"%s\" in current context."),
                                       copy_name ($1.stoken));

it is expected to have no full symbols nor partial symbols, but something
brings full symbols or partial symbols in.  I added "maint info symtabs"
and "maint info psymtabs" in dwzbuildid.exp, and it shows symbols are from
ld.so, which has debug information.  Then, I reproduce the fail like this,

  $ make check RUNTESTFLAGS="CFLAGS_FOR_TARGET='-Wl,-rpath=${glibc_build}:${glibc_build}/math  -Wl,--dynamic-linker=${glibc_build}/elf/ld.so' dwzbuildid.exp"

${glibc_build} is the glibc build tree.  Debug information is not striped,
so the test fail.  However, if I strip debug information from libc.so, libm.so
and ld.so.  The test passes.

This patch is to relax the pattern to match the both cases that glibc build
has and has not debug information.

gdb/testsuite:

2014-05-07  Yao Qi  <yao@codesourcery.com>

	* gdb.dwarf2/dwzbuildid.exp: Match output "No symbol "the_int" in
	current context" too.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dbcf0ae1e13..106ba1104c3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-07  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.dwarf2/dwzbuildid.exp: Match output "No symbol "the_int"
+	in current context" too.
+
 2014-05-05  Keith Seitz  <keiths@redhat.com>
 
 	* gdb.linespec/ls-dollar.exp: Add test for linespec
diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
index af8e5d37809..7bf0d5cfb57 100644
--- a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
@@ -162,7 +162,7 @@ foreach testname {ok mismatch fallback} {
 	if {[runto_main]} {
 	    if {$testname == "mismatch"} {
 		gdb_test "print the_int" \
-		    "No symbol table is loaded.*"
+		    "(No symbol table is loaded|No symbol \"the_int\" in current context).*"
 	    } else {
 		gdb_test "print the_int" " = 99"
 	    }