Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Paul Hilfinger]

Revised test case, with suggested revisions.

Paul N. Hilfinger
(Hilfinger@adacore.com)

This test stops inside a recursive function after a few levels of recursion,
goes up some frames, and then accesses a local variable with 'print foo::val'
rather than the usual 'print val' to see if the former pays attention to the
selected frame.

2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
	    Joel Brobecker <brobecker@adacore.com>

 * gdb.base/recpar.c, gdb.base/recpar.exp: New files.
---
 gdb/testsuite/ChangeLog           |    9 ++++++++
 gdb/testsuite/gdb.base/recpar.c   |   42 +++++++++++++++++++++++++++++++++++++
 gdb/testsuite/gdb.base/recpar.exp |   42 +++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 0 deletions(-)
 create mode 100644 gdb/testsuite/gdb.base/recpar.c
 create mode 100644 gdb/testsuite/gdb.base/recpar.exp

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91b9487..ef85468 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-30  Paul Hilfinger  <hilfingr@adacore.com>
+
+	* gdb.base/recpar.exp: Use standard definitions ($decimal, $hex)
+	in place of local ones.
+
+2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
+
+	* gdb.base/recpar.c, gdb.base/recpar.exp: New files.
+
 2011-12-30  Edjunior Machado  <emachado@linux.vnet.ibm.com>
 
 	* gdb.python/py-finish-breakpoint.exp: Add `.' prefix for ppc64.
diff --git a/gdb/testsuite/gdb.base/recpar.c b/gdb/testsuite/gdb.base/recpar.c
new file mode 100644
index 0000000..bba5f5a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/recpar.c
@@ -0,0 +1,42 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+foo (int n)
+{
+  int val = n;
+
+  {
+    char val = n ? 'y' : 'n'; /* Hides upper-level `val'.  */
+
+    if (val == 'y') /* BREAK */
+      return n + foo (n - 1);
+  }
+
+  return 0;
+}
+
+int
+main (void)
+{
+  int res = foo (5);
+
+  if (res != 15) /* Dummy use of variable res.  */
+    return 1;
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp
new file mode 100644
index 0000000..fe7a70a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/recpar.exp
@@ -0,0 +1,42 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set testfile recpar
+set srcfile ${testfile}.c
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+    return -1
+}
+
+if ![runto_main] {
+    untested ${testfile}.exp
+    return -1
+}
+
+gdb_test "break $srcfile:[gdb_get_line_number BREAK $srcfile] if n == 3" \
+         "Breakpoint $decimal at $hex: file .*recpar\\.c, line $decimal\\."
+
+gdb_test "continue" \
+         "Breakpoint .* foo \\(n=3\\) at .*$srcfile:$decimal.*"
+
+gdb_test "backtrace" \
+         "#0 +foo \\(n=3\\).*\r\n#1.* foo \\(n=4\\).*\r\n#2.* foo \\(n=5\\).*#3.* main \\(\\).*"
+
+gdb_test "frame 2" \
+         "#2 .* foo \\(n=5\\) .*"
+
+# In the currently selected frame, n=5, and thus foo::val should be 5
+# as well.
+gdb_test "print foo::val" \
+         " = 5"
-- 
1.7.0.4

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Joel Brobecker]

Hi Paul,

> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index 91b9487..ef85468 100644
> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,3 +1,12 @@
> +2011-12-30  Paul Hilfinger  <hilfingr@adacore.com>
> +
> +	* gdb.base/recpar.exp: Use standard definitions ($decimal, $hex)
> +	in place of local ones.
> +
> +2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
> +
> +	* gdb.base/recpar.c, gdb.base/recpar.exp: New files.
> +
>  2011-12-30  Edjunior Machado  <emachado@linux.vnet.ibm.com>

In the ChangeLog file, I would merge these two entries.  I think
that the ChangeLog is meant to track the changes in the repository,
and does not need to track the iterations that the patch went through
during review...

-- 
Joel

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Paul Hilfinger]

> In the ChangeLog file, I would merge these two entries.  I think
> that the ChangeLog is meant to track the changes in the repository,
> and does not need to track the iterations that the patch went through
> during review...
> 
Yes, sorry.  That was an oversight.



-- 
Paul N. Hilfinger
(Hilfinger@adacore.com)

[RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Paul Hilfinger]

This test (from Joel Brobecker) stops inside a recursive function
after a few levels of recursion, goes up some frames, and then
accesses a local variable with 'print foo::val' rather than the usual
'print val' to see if the former pays attention to the selected frame.

2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
            Joel Brobecker <brobecker@adacore.com>

 * gdb.base/recpar.c, gdb.base/recpar.exp: New files.
---
 gdb/testsuite/ChangeLog           |    4 +++
 gdb/testsuite/gdb.base/recpar.c   |   42 +++++++++++++++++++++++++++++++++
 gdb/testsuite/gdb.base/recpar.exp |   46 +++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 0 deletions(-)
 create mode 100644 gdb/testsuite/gdb.base/recpar.c
 create mode 100644 gdb/testsuite/gdb.base/recpar.exp

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e07ac47..e669198 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
+
+	* gdb.base/recpar.c, gdb.base/recpar.exp: New files.
+
 2011-12-27  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.base/dmsym.c, gdb.base/dmsym_main.c, gdb.base/dmsym.exp:
diff --git a/gdb/testsuite/gdb.base/recpar.c b/gdb/testsuite/gdb.base/recpar.c
new file mode 100644
index 0000000..bba5f5a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/recpar.c
@@ -0,0 +1,42 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+foo (int n)
+{
+  int val = n;
+
+  {
+    char val = n ? 'y' : 'n'; /* Hides upper-level `val'.  */
+
+    if (val == 'y') /* BREAK */
+      return n + foo (n - 1);
+  }
+
+  return 0;
+}
+
+int
+main (void)
+{
+  int res = foo (5);
+
+  if (res != 15) /* Dummy use of variable res.  */
+    return 1;
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp
new file mode 100644
index 0000000..22771d2
--- /dev/null
+++ b/gdb/testsuite/gdb.base/recpar.exp
@@ -0,0 +1,46 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set testfile recpar
+set srcfile ${testfile}.c
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+    return -1
+}
+
+if ![runto_main] {
+    untested ${testfile}.exp
+    return -1
+}
+
+# Some convenient regular expressions...
+set num "\[0-9\]+"
+set addr "0x\[0-9a-zA-Z\]+"
+
+gdb_test "break $srcfile:[gdb_get_line_number BREAK $srcfile] if n == 3" \
+         "Breakpoint $num at $addr: file .*recpar\\.c, line $num\\."
+
+gdb_test "continue" \
+         "Breakpoint .* foo \\(n=3\\) at .*$srcfile:$num.*"
+
+gdb_test "backtrace" \
+         "#0 +foo \\(n=3\\).*\r\n#1.* foo \\(n=4\\).*\r\n#2.* foo \\(n=5\\).*#3.* main \\(\\).*"
+
+gdb_test "frame 2" \
+         "#2 .* foo \\(n=5\\) .*"
+
+# In the currently selected frame, n=5, and thus foo::val should be 5
+# as well.
+gdb_test "print foo::val" \
+         " = 5"
-- 
1.7.0.4




-- 
Paul N. Hilfinger
(Hilfinger@adacore.com)

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Doug Evans]

On Tue, Dec 27, 2011 at 11:59 AM, Paul Hilfinger <Hilfinger@adacore.com> wrote:
>
> This test (from Joel Brobecker) stops inside a recursive function
> after a few levels of recursion, goes up some frames, and then
> accesses a local variable with 'print foo::val' rather than the usual
> 'print val' to see if the former pays attention to the selected frame.
>
> 2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
>            Joel Brobecker <brobecker@adacore.com>
>
>  * gdb.base/recpar.c, gdb.base/recpar.exp: New files.
> ---
>  gdb/testsuite/ChangeLog           |    4 +++
>  gdb/testsuite/gdb.base/recpar.c   |   42 +++++++++++++++++++++++++++++++++
>  gdb/testsuite/gdb.base/recpar.exp |   46 +++++++++++++++++++++++++++++++++++++
>  3 files changed, 92 insertions(+), 0 deletions(-)
>  create mode 100644 gdb/testsuite/gdb.base/recpar.c
>  create mode 100644 gdb/testsuite/gdb.base/recpar.exp
>
> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index e07ac47..e669198 100644
> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,3 +1,7 @@
> +2011-12-27  Paul Hilfinger  <hilfingr@adacore.com>
> +
> +       * gdb.base/recpar.c, gdb.base/recpar.exp: New files.
> +
>  2011-12-27  Joel Brobecker  <brobecker@adacore.com>
>
>        * gdb.base/dmsym.c, gdb.base/dmsym_main.c, gdb.base/dmsym.exp:
> diff --git a/gdb/testsuite/gdb.base/recpar.c b/gdb/testsuite/gdb.base/recpar.c
> new file mode 100644
> index 0000000..bba5f5a
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/recpar.c
> @@ -0,0 +1,42 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> +   Copyright 2011 Free Software Foundation, Inc.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +int
> +foo (int n)
> +{
> +  int val = n;
> +
> +  {
> +    char val = n ? 'y' : 'n'; /* Hides upper-level `val'.  */
> +
> +    if (val == 'y') /* BREAK */
> +      return n + foo (n - 1);
> +  }
> +
> +  return 0;
> +}
> +
> +int
> +main (void)
> +{
> +  int res = foo (5);
> +
> +  if (res != 15) /* Dummy use of variable res.  */
> +    return 1;
> +
> +  return 0;
> +}
> diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp
> new file mode 100644
> index 0000000..22771d2
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/recpar.exp
> @@ -0,0 +1,46 @@
> +# Copyright (C) 2011 Free Software Foundation, Inc.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +
> +set testfile recpar
> +set srcfile ${testfile}.c
> +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
> +    return -1
> +}
> +
> +if ![runto_main] {
> +    untested ${testfile}.exp
> +    return -1
> +}
> +
> +# Some convenient regular expressions...
> +set num "\[0-9\]+"

Delete, use $decimal.

> +set addr "0x\[0-9a-zA-Z\]+"

This could be replaced with $hex, or do "set addr $hex".  Either is
fine with me.

> +
> +gdb_test "break $srcfile:[gdb_get_line_number BREAK $srcfile] if n == 3" \
> +         "Breakpoint $num at $addr: file .*recpar\\.c, line $num\\."
> +
> +gdb_test "continue" \
> +         "Breakpoint .* foo \\(n=3\\) at .*$srcfile:$num.*"
> +
> +gdb_test "backtrace" \
> +         "#0 +foo \\(n=3\\).*\r\n#1.* foo \\(n=4\\).*\r\n#2.* foo \\(n=5\\).*#3.* main \\(\\).*"
> +
> +gdb_test "frame 2" \
> +         "#2 .* foo \\(n=5\\) .*"
> +
> +# In the currently selected frame, n=5, and thus foo::val should be 5
> +# as well.
> +gdb_test "print foo::val" \
> +         " = 5"
> --

I notice scope.exp has similar tests.
Would it make sense to move this there?

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Paul Hilfinger]

> Date: Tue, 27 Dec 2011 16:58:14 -0800
> From: Doug Evans <dje@google.com>
> Cc: gdb-patches@sourceware.org
> Content-Type: text/plain; charset=ISO-8859-1
> 
> On Tue, Dec 27, 2011 at 11:59 AM, Paul Hilfinger <Hilfinger@adacore.com> wrote:
> >
> > This test (from Joel Brobecker) stops inside a recursive function
> > after a few levels of recursion, goes up some frames, and then
> > accesses a local variable with 'print foo::val' rather than the usual
> > 'print val' to see if the former pays attention to the selected frame.
> >
...
> > +
> > +# Some convenient regular expressions...
> > +set num "\[0-9\]+"
> 
> Delete, use $decimal.

OK.

> > +set addr "0x\[0-9a-zA-Z\]+"
> 
> This could be replaced with $hex, or do "set addr $hex".  Either is
> fine with me.

OK.

> 
> > +
> > +gdb_test "break $srcfile:[gdb_get_line_number BREAK $srcfile] if n == 3" \
> > +         "Breakpoint $num at $addr: file .*recpar\\.c, line $num\\."
> > +
> > +gdb_test "continue" \
> > +         "Breakpoint .* foo \\(n=3\\) at .*$srcfile:$num.*"
> > +
> > +gdb_test "backtrace" \
> > +         "#0 +foo \\(n=3\\).*\r\n#1.* foo \\(n=4\\).*\r\n#2.* foo \\(n=5\\).*#3.* main \\(\\).*"
> > +
> > +gdb_test "frame 2" \
> > +         "#2 .* foo \\(n=5\\) .*"
> > +
> > +# In the currently selected frame, n=5, and thus foo::val should be 5
> > +# as well.
> > +gdb_test "print foo::val" \
> > +         " = 5"
> > --

> I notice scope.exp has similar tests.
> Would it make sense to move this there?
> 

I defer to whatever consensus develops.  All the tests in scope.c that use "::" 
stick to static variables, whereas the new test uses :: in an admittedly
undocumented fashion and concerns dynamic, rather than static, scoping. However,
I don't know what criteria there are for grouping tests.  

Thanks for your comments.

-- 
Paul N. Hilfinger
(Hilfinger@adacore.com)

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Joel Brobecker]

Hi Doug,

> > +# Some convenient regular expressions...
> > +set num "\[0-9\]+"
> Delete, use $decimal.
>
> > +set addr "0x\[0-9a-zA-Z\]+"
>
> This could be replaced with $hex, or do "set addr $hex".  Either is
> fine with me.

Do you know where these are defined? And are there any other such
useful globals that we can use? I need to document them in the
testing cookbook, because I keep looking for them, and then
eventually redefine them over and over again...

Thanks!

> I notice scope.exp has similar tests.
> Would it make sense to move this there?

Personally, I think it's fine to have a small self-contained
testcase that deals mostly with scoping vs recursion. I actually
like it better that way, but I know people may prefer it the other
way. My opinion for liking smaller testcases is that it's usually
easier to reproduce the problem: You don't have to sort through
a lot of unrelated stuff that happens before the problem occurs.

-- 
Joel

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Paul Hilfinger]

> > > +# Some convenient regular expressions...
> > > +set num "\[0-9\]+"
> > Delete, use $decimal.
> >
> > > +set addr "0x\[0-9a-zA-Z\]+"
> >
> > This could be replaced with $hex, or do "set addr $hex".  Either is
> > fine with me.
> 
> Do you know where these are defined? And are there any other such
> useful globals that we can use? I need to document them in the
> testing cookbook, because I keep looking for them, and then
> eventually redefine them over and over again...

Joel,

These are part of dejagnu, defined in .../share/dejagnu/runtest.exp on my
Ubuntu installation, along with a bunch of definitions of 
configuration/environment parameters.

-- 
Paul N. Hilfinger
(Hilfinger@adacore.com)

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Joel Brobecker]

> These are part of dejagnu, defined in .../share/dejagnu/runtest.exp on my
> Ubuntu installation, along with a bunch of definitions of
> configuration/environment parameters.

Thanks! I updated the testing cookbook to include the ones I could
find there, as well as in gdb.exp. That's 7 variables in total,
including one I forgot about (octal).

-- 
Joel

Re: [RFA] Add testcase for locals identified with FUNCTION::VAR syntax.

[Doug Evans]

On Tue, Dec 27, 2011 at 7:50 PM, Joel Brobecker <brobecker@adacore.com> wrote:
> Do you know where these are defined? And are there any other such
> useful globals that we can use? I need to document them in the
> testing cookbook, because I keep looking for them, and then
> eventually redefine them over and over again...

[Paul already replied, but yeah, /usr/share/dejagnu/runtest.exp.]

> Thanks!
>
>> I notice scope.exp has similar tests.
>> Would it make sense to move this there?
>
> Personally, I think it's fine to have a small self-contained
> testcase that deals mostly with scoping vs recursion. I actually
> like it better that way, but I know people may prefer it the other
> way. My opinion for liking smaller testcases is that it's usually
> easier to reproduce the problem: You don't have to sort through
> a lot of unrelated stuff that happens before the problem occurs.

I don't have a strong preference.
I mostly just wanted to raise the issue.
The patch is fine with me.

[I'd feel uncomfortable with forcing someone to hack on scope* before
cleaning it up anyway. :-)]