From f1a4a6a666a0f141da1f768096c899996a69a92d Mon Sep 17 00:00:00 2001 From: nobody <> Date: Tue, 31 Jul 2012 07:33:17 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'gdb_7_5-branch'. Cherrypick from master 2012-07-31 07:33:16 UTC Jan Kratochvil 'gdb/': gdb/testsuite/gdb.base/valgrind-infcall.c gdb/testsuite/gdb.base/valgrind-infcall.exp --- gdb/testsuite/gdb.base/valgrind-infcall.c | 40 +++++++ gdb/testsuite/gdb.base/valgrind-infcall.exp | 115 ++++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 gdb/testsuite/gdb.base/valgrind-infcall.c create mode 100644 gdb/testsuite/gdb.base/valgrind-infcall.exp diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.c b/gdb/testsuite/gdb.base/valgrind-infcall.c new file mode 100644 index 00000000000..c119b7ec05b --- /dev/null +++ b/gdb/testsuite/gdb.base/valgrind-infcall.c @@ -0,0 +1,40 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2012 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 . */ + +#include + +static volatile int infcall_var; + +static int +gdb_test_infcall (void) +{ + return ++infcall_var; +} + +int +main (void) +{ + void *p; + + gdb_test_infcall (); + p = malloc (1); + if (p == NULL) + return 1; + free (p); + free (p); /* double-free */ + return 0; +} diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp new file mode 100644 index 00000000000..ede26f4d0a9 --- /dev/null +++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp @@ -0,0 +1,115 @@ +# Copyright 2012 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 . + +if [is_remote target] { + # The test always runs locally. + return 0 +} + +set test valgrind-infcall +set srcfile $test.c +set executable $test +set binfile ${objdir}/${subdir}/${executable} +if {[build_executable $test.exp $executable $srcfile {debug}] == -1} { + return -1 +} + +set test "spawn valgrind" +set cmd "valgrind --vgdb-error=0 $binfile" +set res [remote_spawn host $cmd]; +if { $res < 0 || $res == "" } { + verbose -log "Spawning $cmd failed." + unsupported $test + return -1 +} +pass $test +# Declare GDB now as running. +set gdb_spawn_id -1 + +# GDB started by vgdb stops already after the startup is executed, like with +# non-extended gdbserver. It is also not correct to run/attach the inferior. +set use_gdb_stub 1 + +set test "valgrind started" +# The trailing '.' differs for different memcheck versions. +gdb_test_multiple "" $test { + -re "Memcheck, a memory error detector\\.?\r\n" { + pass $test + } + -re "valgrind: failed to start tool 'memcheck' for platform '.*': No such file or directory" { + unsupported $test + return -1 + } + -re "valgrind: wrong ELF executable class" { + unsupported $test + return -1 + } + -re "command not found" { + # The spawn succeeded, but then valgrind was not found - e.g. if + # we spawned SSH to a remote system. + unsupported $test + return -1 + } + -re "valgrind: Bad option '--vgdb-error=0'" { + # valgrind is not >= 3.7.0. + unsupported $test + return -1 + } +} + +set test "vgdb prompt" +# The trailing '.' differs for different memcheck versions. +gdb_test_multiple "" $test { + -re " (target remote | \[^\r\n\]*/vgdb \[^\r\n\]*)\r\n" { + set vgdbcmd $expect_out(1,string) + pass $test + } +} + +# Do not kill valgrind. +unset gdb_spawn_id +set board [host_info name] +unset_board_info fileid + +clean_restart $executable + +gdb_test "$vgdbcmd" " in _start .*" "target remote for vgdb" + +gdb_test "monitor v.set gdb_output" "valgrind output will go to gdb.*" + +set continue_count 1 +while 1 { + set test "continue #$continue_count" + gdb_test_multiple "continue" "" { + -re "Invalid free\\(\\).*: main .*\r\n$gdb_prompt $" { + pass $test + break + } + -re "\r\n$gdb_prompt $" { + pass "$test (false warning)" + } + } + set continue_count [expr $continue_count + 1] +} + +set test "p gdb_test_infcall ()" +gdb_test_multiple $test $test { + -re "unhandled instruction bytes.*\r\n$gdb_prompt $" { + fail $test + } + -re "Continuing \\.\\.\\..*\r\n\\\$1 = 2\r\n$gdb_prompt $" { + pass $test + } +} -- 2.47.2