Re: [PATCH 5/9] Canceling pagination caused by execution command from command line aborts readline/gdb

[Yao Qi <yao at codesourcery dot com>]

Hi, Pedro,
the fix looks reasonable to me, some comments on test case.

On 07/03/2014 11:18 PM, Pedro Alves wrote:
> diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.c b/gdb/testsuite/gdb.base/paginate-execution-startup.c
> new file mode 100644
> index 0000000..7457b18
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/paginate-execution-startup.c
> @@ -0,0 +1,30 @@
> +/* 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/>.  */
> +
> +static void
> +after_sleep (void)
> +{
> +  return; /* after sleep */
> +}
> +
> +int
> +main (void)
> +{
> +  sleep (3);

We need to include <unistd.h>.  With some old mingw32 gcc (4.7.3), I
get the error: undefined reference to `sleep' (note that
i686-w64-mingw32-gcc 4.8.2 doesn't complain on this).  I fixed it by

#ifdef _WIN32
#include <windows.h>
#define sleep(x) Sleep(1000 * x)
#else
#include <unistd.h>
#endif

> +  after_sleep ();
> +  return 0;
> +}
> diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.exp b/gdb/testsuite/gdb.base/paginate-execution-startup.exp
> new file mode 100644
> index 0000000..77822fb
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/paginate-execution-startup.exp
> @@ -0,0 +1,175 @@
> +# Copyright (C) 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/>.
> +
> +# A collection of tests related to pagination resulting from running
> +# execution commands directly from the command line, with "-ex".
> +
> +standard_testfile
> +
> +if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
> +    return -1
> +}
> +
> +global GDBFLAGS
> +set saved_gdbflags $GDBFLAGS
> +
> +# Returns true if the board can 'gdb -ex "start"', false otherwise.
> +
> +proc probe_can_run_cmdline  {} {
> +    global srcfile binfile
> +    global saved_gdbflags GDBFLAGS
> +    global gdb_prompt
> +
> +    set GDBFLAGS $saved_gdbflags
> +    append GDBFLAGS " -ex \"set height 0\""
> +    append GDBFLAGS " -ex \"start\""
> +    append GDBFLAGS " --args \"$binfile\""

This doesn't work on remote host, as we haven't copy binfile from build
to host yet.  We can do this after build_executable, and pass $file_arg
to each proc instead of using $binfile in each proc.

set file_arg $binfile
if [is_remote host] {
  set file_arg [remote_download host $file_arg]
}

> +
> +    with_test_prefix "probe support" {
> +	set test "run to main"
> +
> +	gdb_exit
> +	set res [gdb_spawn]
> +	if { $res != 0} {
> +	    fail $test
> +	    return -1
> +	}
> +
> +	set res -1
> +	gdb_test_multiple "" $test {
> +	    -re "main .* at .*$srcfile.*$gdb_prompt $" {
> +		set res 1
> +		pass $test
> +	    }
> +	    -re "Don't know how to run.*$gdb_prompt $" {
> +		set res 0
> +		unsupported $test
> +	    }
> +	}
> +	return $res
> +    }
> +}
> +
> +# Check that we handle pagination correctly when it triggers due to an
> +# execution command entered directly on the command line.
> +
> +proc test_fg_execution_pagination_return {} {
> +    global binfile
> +    global saved_gdbflags GDBFLAGS
> +    global gdb_prompt pagination_prompt
> +
> +    set GDBFLAGS $saved_gdbflags
> +    append GDBFLAGS " -ex \"set height 2\""
> +    append GDBFLAGS " -ex \"start\""
> +    append GDBFLAGS " --args \"$binfile\""
> +
> +    with_test_prefix "return" {
> +	set test "run to pagination"
> +
> +	gdb_exit
> +	set res [gdb_spawn]
> +	if { $res != 0} {
> +	    fail $test
> +	    return $res
> +	}
> +	gdb_test_multiple "" $test {
> +	    -re "$pagination_prompt$" {
> +		pass $test
> +	    }
> +	    -re "$gdb_prompt $" {
> +		fail $test
> +	    }
> +	}
> +
> +	send_gdb "\n"
> +
> +	set saw_pagination_prompt 0
> +	set test "send \\n to GDB"
> +	gdb_test_multiple "" $test {
> +	    -re "$pagination_prompt$" {
> +		set saw_pagination_prompt 1
> +		send_gdb "\n"
> +		exp_continue
> +	    }
> +	    -notransfer -re "<return>" {
> +		# Otherwise gdb_test_multiple considers this an error.
> +		exp_continue
> +	    }
> +	    -re "$gdb_prompt $" {
> +		gdb_assert $saw_pagination_prompt $test
> +	    }
> +	}
> +
> +	gdb_test "p 1" " = 1" "GDB accepts further input"
> +    }
> +}
> +
> +# Check that we handle canceling pagination correctly when it triggers
> +# due to an execution command entered directly on the command line.
> +
> +proc test_fg_execution_pagination_cancel { how } {
> +    global binfile
> +    global saved_gdbflags GDBFLAGS
> +    global gdb_prompt pagination_prompt
> +
> +    set GDBFLAGS $saved_gdbflags
> +
> +    append GDBFLAGS " -ex \"set height 2\""
> +    append GDBFLAGS " -ex \"start\""
> +    append GDBFLAGS " --args \"$binfile\""
> +
> +    with_test_prefix "ctrl-c" {
> +	set test "run to pagination"
> +
> +	gdb_exit
> +	set res [gdb_spawn]
> +	if { $res != 0} {
> +	    fail $test
> +	    return $res
> +	}
> +	gdb_test_multiple "" $test {
> +	    -re "$pagination_prompt$" {
> +		pass $test
> +	    }
> +	    -notransfer -re "<return>" {
> +		# Otherwise gdb_test_multiple considers this an error.
> +		exp_continue
> +	    }
> +	}
> +
> +	set test "cancel pagination"
> +	if { $how == "ctrl-c" } {
> +	    send_gdb "\003"
> +	} else {
> +	    send_gdb "q\n"
> +
> +	}
> +	gdb_test_multiple "" $test {
> +	    -re "Quit\r\n$gdb_prompt $" {
> +		pass $test
> +	    }
> +	}
> +
> +	gdb_test "p 1" " = 1" "GDB accepts further input"
> +    }
> +}
> +
> +if {[probe_can_run_cmdline] > 0} {
> +    test_fg_execution_pagination_return
> +    test_fg_execution_pagination_cancel "ctrl-c"

Skip it if [target_info exists gdb,nointerrupts] is true?

-- 
Yao (éå)