[patch 2/2, 7.3] Fix 7.1->7.2 regression: info sources

[patch 2/2, 7.3] Fix 7.1->7.2 regression: info sources

[Jan Kratochvil]

Hi,

https://bugzilla.redhat.com/show_bug.cgi?id=712117
724d4482b9db1aced5ae391ad624f76877991232 is the first bad commit
[PATCH] Fix regression in -file-list-exec-source-files command.
http://sourceware.org/ml/gdb-patches/2010-08/msg00333.html
http://sourceware.org/ml/gdb-patches/2010-09/msg00090.html

`info sources' no longer displays the pathname.  Fix it.

Source files for which symbols will be read in on demand:
file1.txt
(gdb) FAIL: gdb.dwarf2/dw2-filename.exp: info sources
->
Source files for which symbols will be read in on demand:
/home/jkratoch/redhat/gdb-clean/gdb/testsuite/gdb.dwarf2/file1.txt
(gdb) PASS: gdb.dwarf2/dw2-filename.exp: info sources

No regressions on {x86_64,x86_64-m32,i686}-fedora15-linux-gnu.

I believe it should go for 7.3, I will check it in there.


Thanks,
Jan


gdb/
2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* symtab.c (output_partial_symbol_filename): Exchange the filename and
	fullname parameters order.

gdb/testsuite/
2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.dwarf2/dw2-filename.exp (info sources): New testcase.

--- 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);
--- 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}

Re: [patch 2/2, 7.3] Fix 7.1->7.2 regression: info sources

[Tom Tromey]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Jan> I believe it should go for 7.3, I will check it in there.

I agree.

Jan> 	* symtab.c (output_partial_symbol_filename): Exchange the filename and
Jan> 	fullname parameters order.

This isn't the first bug like this :-(

Tom

Re: [patch 2/2, 7.3] Fix 7.1->7.2 regression: info sources

[Joel Brobecker]

> I believe it should go for 7.3, I will check it in there.

Agreed as well.

> gdb/testsuite/
> 2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
> 
> 	* gdb.dwarf2/dw2-filename.exp (info sources): New testcase.


> +# And `info sources' should return the fullname incl. the directories.
> +gdb_test "info sources" {/file1\.txt}

I don't think this is going to work on MinGW. But do we support
running the testsuite on MinGW?

-- 
Joel

Re: [patch 2/2, 7.3] Fix 7.1->7.2 regression: info sources

[Jan Kratochvil]

On Fri, 10 Jun 2011 23:26:35 +0200, Joel Brobecker wrote:
> > +gdb_test "info sources" {/file1\.txt}
> 
> I don't think this is going to work on MinGW. But do we support
> running the testsuite on MinGW?

I do not know but maybe the testsuite do not have so many pathname delimiters
expectations; changed it.


On Fri, 10 Jun 2011 22:56:09 +0200, Tom Tromey wrote:
> I agree.

On Fri, 10 Jun 2011 23:26:35 +0200, Joel Brobecker wrote:
> Agreed as well.

Checked in, HEAD:
	http://sourceware.org/ml/gdb-cvs/2011-06/msg00056.html
and 7.3:
	http://sourceware.org/ml/gdb-cvs/2011-06/msg00057.html


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2011-06/msg00056.html

--- src/gdb/ChangeLog	2011/06/10 21:48:03	1.13087
+++ src/gdb/ChangeLog	2011/06/10 21:50:53	1.13088
@@ -1,5 +1,10 @@
 2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	* symtab.c (output_partial_symbol_filename): Exchange the filename and
+	fullname parameters order.
+
+2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
 	Code cleanup.
 	* dwarf2read.c (dw2_map_symbol_filenames): Use symbol_filename_ftype
 	for fun.
--- src/gdb/testsuite/ChangeLog	2011/06/10 16:21:46	1.2742
+++ src/gdb/testsuite/ChangeLog	2011/06/10 21:50:55	1.2743
@@ -1,3 +1,7 @@
+2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.dwarf2/dw2-filename.exp (info sources): New testcase.
+
 2011-06-10  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.cp/temargs.exp: Let tests pass if compiler bug is fixed.
--- src/gdb/symtab.c	2011/05/18 16:30:36	1.274
+++ src/gdb/symtab.c	2011/06/10 21:50:54	1.275
@@ -2837,7 +2837,7 @@
 
 /* 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);
--- src/gdb/testsuite/gdb.dwarf2/dw2-filename.exp	2011/01/19 20:26:09	1.3
+++ src/gdb/testsuite/gdb.dwarf2/dw2-filename.exp	2011/06/10 21:50:55	1.4
@@ -38,3 +38,6 @@
 # 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}