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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 72592f0b22e7cf162311e5351682b37f4ccd96f1..85ac0bbc675ca7bb9beaef8926f4a78f086c9129 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * symtab.c (output_partial_symbol_filename): Exchange the filename and
+       fullname parameters order.
+
 2011-06-03  Tom Tromey  <tromey@redhat.com>
 
        * python/py-inferior.c (python_inferior_exit): Use inferior's exit

diff --git a/gdb/symtab.c b/gdb/symtab.c
index d74f6e66b16fe66081d25d882a26e816a65cb611..7be368736dbeab7436081474884d661360b267cb 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2840,7 +2840,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 aeda9a97a62b0a6c6bdee2729c50a26d6c542ede..ad5617ec5d428c36f0b7eecb182d45a259754c51 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.dwarf2/dw2-filename.exp (info sources): New testcase.
+
 2011-05-31  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.arch/i386-dr3-watch.c: New file.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
index 2d87446c5f0c522f316c0f946152baedea4ef543..fb7cf6408c298866ed874d3701a4d2c03785ce69 100644 (file)
--- 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}