-# Copyright 2000, 2004, 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2000-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
# This file was written by Michael Snyder (msnyder@redhat.com)
-if $tracelevel then {
- strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
# re-use the program from the "return2" test.
-set testfile "return2"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested finish.exp
- return -1
+if { [prepare_for_testing finish.exp finish return2.c] } {
+ return -1
}
proc finish_1 { type } {
"set break on ${type}_func"
gdb_test "continue" "Breakpoint.* ${type}_func.*" \
"continue to ${type}_func"
- send_gdb "finish\n"
- gdb_expect {
+ gdb_test_multiple "finish" "finish from ${type}_func" {
-re ".*Value returned is .* = 49 '1'\r\n$gdb_prompt $" {
if { $type == "char" } {
pass "finish from char_func"
-re ".*Value returned is .* = 1\r\n$gdb_prompt $" {
pass "finish from ${type}_func"
}
- -re ".*$gdb_prompt $" {
- fail "finish from ${type}_func"
- }
- timeout {
- fail "finish from ${type}_func (timeout)"
- }
}
}
"set break on void_func"
gdb_test "continue" "Breakpoint.* void_func.*" \
"continue to void_func"
- send_gdb "finish\n"
# Some architectures will have one or more instructions after the
# call instruction which still is part of the call sequence, so we
# must be prepared for a "finish" to show us the void_func call
# again as well as the statement after.
- gdb_expect {
+ gdb_test_multiple "finish" "finish from void_func" {
-re ".*void_checkpoint.*$gdb_prompt $" {
pass "finish from void_func"
}
-re "0x\[0-9a-fA-F\]+ in main.*call to void_func.*$gdb_prompt $" {
pass "finish from void_func"
}
- -re ".*$gdb_prompt $" {
- fail "finish from void_func"
- }
- timeout {
- fail "finish from void_func (timeout)"
- }
}
}
finish_1 "int"
finish_1 "long"
finish_1 "long_long"
- finish_1 "float"
- finish_1 "double"
+ if ![target_info exists gdb,skip_float_tests] {
+ finish_1 "float"
+ finish_1 "double"
+ }
finish_abbreviation "fin"
}
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
+set prev_timeout $timeout
set timeout 30
finish_tests
+set timeout $prev_timeout