From 533a737ed5f6de1299ced68234b2b147cd4396c7 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 10 Jun 2011 21:50:55 +0000 Subject: [PATCH] gdb/ * symtab.c (output_partial_symbol_filename): Exchange the filename and fullname parameters order. gdb/testsuite/ * gdb.dwarf2/dw2-filename.exp (info sources): New testcase. --- gdb/ChangeLog | 5 +++++ gdb/symtab.c | 2 +- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.dwarf2/dw2-filename.exp | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8962f1a..c72fda4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-06-10 Jan Kratochvil + * symtab.c (output_partial_symbol_filename): Exchange the filename and + fullname parameters order. + +2011-06-10 Jan Kratochvil + Code cleanup. * dwarf2read.c (dw2_map_symbol_filenames): Use symbol_filename_ftype for fun. diff --git a/gdb/symtab.c b/gdb/symtab.c index 8879ddf..ba86dec 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2837,7 +2837,7 @@ output_source_filename (const char *name, int *first) /* A callback for map_partial_symbol_filenames. */ static void -output_partial_symbol_filename (const char *fullname, const char *filename, +output_partial_symbol_filename (const char *filename, const char *fullname, void *data) { output_source_filename (fullname ? fullname : filename, data); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 297d1cb..8242272 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-06-10 Jan Kratochvil + + * gdb.dwarf2/dw2-filename.exp (info sources): New testcase. + 2011-06-10 Tom Tromey * gdb.cp/temargs.exp: Let tests pass if compiler bug is fixed. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp index 2d87446..fb7cf64 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp @@ -38,3 +38,6 @@ clean_restart ${testfile}.x # is that the file and fullname fields are now inverted. gdb_test "interpreter-exec mi -file-list-exec-source-files" \ ".*{file=\"file1\\.txt\",fullname=\".+file1\\.txt\"}.*" + +# And `info sources' should return the fullname incl. the directories. +gdb_test "info sources" {[/\\]file1\.txt} -- 2.7.4