Re: [PATCH] fix record "run" regression

Pedro Alves
2014-07-04T14:41:15Z

On 07/03/2014 07:12 PM, Tom Tromey wrote:
> Pedro> The test should first probe whether "start" with without
> Pedro> record actually worked. I think you'll get an error
> Pedro> with --target_board=native-gdbserver as is, because
> Pedro> the first runto main will use something like
> Pedro> "target remote ...; tb main; c" instead of "run/start", while the target
> Pedro> really does not support "run". I'd replace the first runto main
> Pedro> with explicit "start", and issue unsupported if "does not support"
> Pedro> comes out then.
>
> I ended up having it check $use_gdb_stub.

Thanks, that works too.

>
> I think this version addresses all your comments.
> Let me know what you think.
>
> Tom
>
> 2014-07-03 Tom Tromey <tromey@redhat.com>
>
> * target.c (target_require_runnable): Also check record_stratum.
> Update comment.
>
> 2014-07-03 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 ece59e6..180ec26 100644
> --- a/gdb/target.c
> +++ b/gdb/target.c
> @@ -2423,10 +2423,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..cd2305b
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/rerun-prec.exp
> @@ -0,0 +1,47 @@
> +# 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.

Hmm, I think you should be able to. gdb_run_cmd explicitly
does not consume the prompt (using -notransfer) exactly for these
cases.

# N.B. This function does not wait for gdb to return to the prompt,
# that is the caller's responsibility.

proc gdb_run_cmd {args} {

So we should be able to do:

gdb_run_cmd
gdb_test_multiple "" "restarting inferior" {
...

> +gdb_test_multiple start "restarting inferior" {
> + -re "The program .* has been started already.*y or n. $" {
> + send_gdb "y\n"
> + exp_continue
> + }
> + -re "does not support \"run\"" {
> + fail "restarting inferior"
> + }
> + -re "Starting program: \[^\r\n\]*" {
> + pass "restarting inferior"
> + }

You've removed the -notransfer, but any reason you didn't add
the $gdb_prompt matching?

--
Pedro Alves