Re: [PATCH] fix record "run" regression

Pedro Alves
2014-07-08T09:26:29Z

On 07/07/2014 04:29 PM, Tom Tromey wrote:
> Pedro> So we should be able to do:
> Pedro> gdb_run_cmd
> Pedro> gdb_test_multiple "" "restarting inferior" {
> [...]
> Pedro> You've removed the -notransfer, but any reason you didn't add
> Pedro> the $gdb_prompt matching?
>
> How's this?
>
> Tom
>
> 2014-07-07 Tom Tromey <tromey@redhat.com>
>
> * target.c (target_require_runnable): Also check record_stratum.
> Update comment.
>
> 2014-07-07 Tom Tromey <tromey@redhat.com>
>
> * gdb.reverse/rerun-prec.c: New file.
> * gdb.reverse/rerun-prec.exp: New file.
>
> diff --git a/gdb/target.c b/gdb/target.c
> index c9c5e4b..07d029a 100644
> --- a/gdb/target.c
> +++ b/gdb/target.c
> @@ -2425,10 +2425,11 @@ target_require_runnable (void)
> if (t->to_create_inferior != NULL)
> return;
>
> - /* Do not worry about thread_stratum targets that can not
> + /* Do not worry about targets at certain strata that can not
> create inferiors. Assume they will be pushed again if
> necessary, and continue to the process_stratum. */
> if (t->to_stratum == thread_stratum
> + || t->to_stratum == record_stratum
> || t->to_stratum == arch_stratum)
> continue;
>
> diff --git a/gdb/testsuite/gdb.reverse/rerun-prec.c b/gdb/testsuite/gdb.reverse/rerun-prec.c
> new file mode 100644
> index 0000000..c0f90cb
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/rerun-prec.c
> @@ -0,0 +1,21 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> + Copyright 2014 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 main (int argc, char **argv)
> +{
> + return 0;
> +}
> diff --git a/gdb/testsuite/gdb.reverse/rerun-prec.exp b/gdb/testsuite/gdb.reverse/rerun-prec.exp
> new file mode 100644
> index 0000000..c168ead
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/rerun-prec.exp
> @@ -0,0 +1,44 @@
> +# Copyright 2014 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/>. */
> +
> +if {![supports_reverse] || ![supports_process_record]} {
> + return
> +}
> +
> +standard_testfile
> +
> +if {[prepare_for_testing $testfile.exp $testfile [list $srcfile]]} {
> + return -1
> +}
> +
> +if {$use_gdb_stub} {
> + unsupported "re-running not supported on this board"
> + return
> +}
> +
> +# The bug is a regression in the sequence "run; record; run".
> +runto main
> +gdb_test_no_output "record" "Turn on process record"
> +
> +# We can't use gdb_run_cmd or the like since we need to detect errors.

The comment is stale now. If we can indeed use gdb_run_cmd,
then I don't think we need the $use_gdb_stub check?
That gets us coverage for "target rem; record; target rem;"
too. If we remove the $use_gdb_stub restriction, then the
"Starting program" below won't match, but we can match the
hit at main instead.

> +gdb_run_cmd
> +gdb_test_multiple "" "restarting inferior" {
> + -re "does not support \"run\"" {

This one also missed the prompt matching. But, I think
you can just remove this, as gdb_test_multiple will
fail anyway without it.

> + fail "restarting inferior"
> + }
> + -re "Starting program: .*${gdb_prompt} " {
> + pass "restarting inferior"
> + }
> +}

Thanks,
--
Pedro Alves