OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* gdb.base/call-ar-st.exp (set_lang_c): Delete, unused. 

* gdb.base/callfuncs.exp (set_lang_c): Delete, set c language directly.
	* gdb.base/printcmds.exp (set_lang_c): Delete, set c language directly.
	Simplify, early exit if runto_main fails.
	* gdb.fortran/exprs.exp: load_lib fortran.exp.
	(set_lang_fortran): Moved to lib/fortran.exp.
	* gdb.fortran/types.exp: load_lib fortran.exp.
	(set_lang_fortran): Moved to lib/fortran.exp.
	* gdb.java/jmisc.exp (set_lang_java): Moved to lib/java.exp.
	* gdb.java/jprint.exp (set_lang_java): Ditto.
	* gdb.java/jv-exp.exp: load_lib java.exp.
	If set_lang_java fails, issue a warning instead of failure to be
	consistent with other set_lang_foo uses.
	(set_lang_java): Moved to lib/java.exp.
	* gdb.java/jv-print.exp (set_lang_java): Moved to lib/java.exp.
	If set_lang_java fails, issue a warning instead of failure to be
	consistent with other set_lang_foo uses.
	* gdb.pascal/types.exp: load_lib pascal.exp.
	(set_lang_pascal): Moved to lib/pascal.exp.
	* lib/fortran.exp: New file.
	* lib/java.exp (set_lang_java): New function.
	* lib/pascal.exp (set_lang_pascal): New function.
This commit is contained in:
Doug Evans 2010-08-18 16:37:22 +00:00
parent 856d6f99ff
commit f1208f9e0a
14 changed files with 126 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,28 @@
2010-08-18 Doug Evans <dje@google.com>
* gdb.base/call-ar-st.exp (set_lang_c): Delete, unused.
* gdb.base/callfuncs.exp (set_lang_c): Delete, set c language directly.
* gdb.base/printcmds.exp (set_lang_c): Delete, set c language directly.
Simplify, early exit if runto_main fails.
* gdb.fortran/exprs.exp: load_lib fortran.exp.
(set_lang_fortran): Moved to lib/fortran.exp.
* gdb.fortran/types.exp: load_lib fortran.exp.
(set_lang_fortran): Moved to lib/fortran.exp.
* gdb.java/jmisc.exp (set_lang_java): Moved to lib/java.exp.
* gdb.java/jprint.exp (set_lang_java): Ditto.
* gdb.java/jv-exp.exp: load_lib java.exp.
If set_lang_java fails, issue a warning instead of failure to be
consistent with other set_lang_foo uses.
(set_lang_java): Moved to lib/java.exp.
* gdb.java/jv-print.exp (set_lang_java): Moved to lib/java.exp.
If set_lang_java fails, issue a warning instead of failure to be
consistent with other set_lang_foo uses.
* gdb.pascal/types.exp: load_lib pascal.exp.
(set_lang_pascal): Moved to lib/pascal.exp.
* lib/fortran.exp: New file.
* lib/java.exp (set_lang_java): New function.
* lib/pascal.exp (set_lang_pascal): New function.
2010-08-18 Yao Qi <yao@codesourcery.com
* gdb.dwarf2/dw2-ref-missing-frame-func.c: Add .p2align 4 for labels

24
gdb/testsuite/gdb.base/call-ar-st.exp
View File

@ -55,30 +55,6 @@ if [target_info exists gdb,cannot_call_functions] {
set oldtimeout $timeout
set timeout [expr "$timeout + 60"]
# Set the current language to C. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_c {} {
global gdb_prompt
gdb_test_no_output "set language c"
gdb_test_multiple "show language" "set language to \"c\"" {
-re ".* source language is \"c\".*$gdb_prompt $" {
pass "set language to \"c\""
return 1
}
-re ".*$gdb_prompt $" {
fail "set language to \"c\""
return 0
}
timeout {
fail "(timeout) set language to \"c\""
return 0
}
}
}
# Start with a fresh gdb.
gdb_exit

27
gdb/testsuite/gdb.base/callfuncs.exp
View File

@ -21,7 +21,6 @@ if $tracelevel then {
strace $tracelevel
}
set testfile "callfuncs"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@ -52,25 +51,6 @@ if [target_info exists gdb,cannot_call_functions] {
continue
}
# Set the current language to C. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_c {} {
global gdb_prompt
gdb_test_no_output "set language c"
set success 0
gdb_test_multiple "show language" "set language to \"c\"" {
-re ".* source language is \"c\".*$gdb_prompt $" {
pass "set language to \"c\""
set success 1
}
}
return $success
}
# FIXME: Before calling this proc, we should probably verify that
# we can call inferior functions and get a valid integral value
# returned.
@ -315,12 +295,9 @@ if { $hp_aCC_compiler } {
gdb_test_no_output "set overload-resolution 0"
} else {
if { ![set_lang_c] } {
gdb_test_no_output "set language c"
if { ![runto_main] } {
gdb_suppress_tests;
} else {
if { ![runto_main] } {
gdb_suppress_tests;
}
}
}

77
gdb/testsuite/gdb.base/printcmds.exp
View File

@ -25,7 +25,6 @@ if $tracelevel then {
strace $tracelevel
}
set testfile "printcmds"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@ -36,22 +35,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
get_compiler_info ${binfile}
# Set the current language to C. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_c {} {
global gdb_prompt
if [gdb_test_no_output "set language c" "set language c"] {
return 0
}
if [gdb_test "show language" ".* source language is \"c\".*"] {
return 0
}
return 1;
}
proc test_integer_literals_accepted {} {
global gdb_prompt
@ -781,34 +764,34 @@ gdb_test_no_output "set print sevenbit-strings"
gdb_test_no_output "set print address off"
gdb_test_no_output "set width 0"
if [set_lang_c] then {
if { [test_compiler_info "armcc-*"] } {
# ARM RealView compresses large arrays in the data segment.
# Before the program starts, we can not read them. There is
# nothing in the file to indicate that data is compressed.
setup_xfail "arm*-*-eabi"
}
gdb_test "p ctable1\[120\]" "120 'x'" "p ctable1\[120\] #1"
gdb_load ${binfile}
if [runto_main] then {
test_integer_literals_accepted
test_integer_literals_rejected
test_character_literals_accepted
test_print_all_chars
test_print_repeats_10
test_print_strings
test_print_int_arrays
test_print_typedef_arrays
test_artificial_arrays
test_print_char_arrays
# We used to do the runto main here.
test_print_string_constants
test_print_array_constants
test_print_enums
test_printf
test_printf_with_dfp
}
} else {
fail "C print command tests suppressed"
if { [test_compiler_info "armcc-*"] } {
# ARM RealView compresses large arrays in the data segment.
# Before the program starts, we can not read them. There is
# nothing in the file to indicate that data is compressed.
setup_xfail "arm*-*-eabi"
}
gdb_test "p ctable1\[120\]" "120 'x'" "p ctable1\[120\] #1"
gdb_load ${binfile}
if ![runto_main] then {
fail "Can't run to main"
return 0
}
test_integer_literals_accepted
test_integer_literals_rejected
test_character_literals_accepted
test_print_all_chars
test_print_repeats_10
test_print_strings
test_print_int_arrays
test_print_typedef_arrays
test_artificial_arrays
test_print_char_arrays
# We used to do the runto main here.
test_print_string_constants
test_print_array_constants
test_print_enums
test_printf
test_printf_with_dfp

20
gdb/testsuite/gdb.fortran/exprs.exp
View File

@ -21,26 +21,10 @@ if $tracelevel then {
strace $tracelevel
}
load_lib "fortran.exp"
if { [skip_fortran_tests] } { continue }
# Set the current language to fortran. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_fortran {} {
global gdb_prompt
if [gdb_test "set language fortran" ""] {
return 0;
}
if ![gdb_test "show language" ".* source language is \"fortran\".*"] {
return 1;
} else {
return 0;
}
}
proc test_integer_literals_accepted {} {
global gdb_prompt

20
gdb/testsuite/gdb.fortran/types.exp
View File

@ -21,26 +21,10 @@ if $tracelevel then {
strace $tracelevel
}
load_lib "fortran.exp"
if { [skip_fortran_tests] } { continue }
# Set the current language to fortran. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_fortran {} {
global gdb_prompt
if [gdb_test "set language fortran" ""] {
return 0;
}
if ![gdb_test "show language" ".* source language is \"fortran\".*"] {
return 1;
} else {
return 0;
}
}
proc test_integer_literal_types_accepted {} {
global gdb_prompt

19
gdb/testsuite/gdb.java/jmisc.exp
View File

@ -32,32 +32,17 @@ if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
continue
}
# Set the current language to java. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_java {} {
global gdb_prompt
global binfile objdir subdir
verbose "loading file '$binfile'"
gdb_load $binfile
gdb_test_no_output "set language java"
return [gdb_test "show language" ".* source language is \"java\".*" \
"set language to \"java\""]
}
# Start with a fresh gdb.
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load $binfile
gdb_test "set print sevenbit-strings" ".*"
if ![set_lang_java] then {
if [set_lang_java] then {
# Ref PR gdb:java/1565. Don't use the simpler "break jmisc.main".
# As of 2004-02-24 it wasn't working and is being tested separatly.
# Before GCJ 4.1 (approximately) the demangled name did not include

19
gdb/testsuite/gdb.java/jprint.exp
View File

@ -31,32 +31,17 @@ if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
continue
}
# Set the current language to java. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_java {} {
global gdb_prompt
global binfile objdir subdir
verbose "loading file '$binfile'"
gdb_load $binfile
gdb_test_no_output "set language java"
return [gdb_test "show language" ".* source language is \"java\".*" \
"set language to \"java\""]
}
# Start with a fresh gdb.
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load $binfile
gdb_test "set print sevenbit-strings" ".*"
if ![set_lang_java] then {
if [set_lang_java] then {
# Ref PR gdb:java/1565. Don't use the simpler "break jmisc.main".
# As of 2004-02-24 it wasn't working and is being tested separatly.
# Before GCJ 4.1 (approximately) the demangled name did not include

19
gdb/testsuite/gdb.java/jv-exp.exp
View File

@ -17,22 +17,7 @@ if $tracelevel then {
strace $tracelevel
}
# Set the current language to Java. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_java {} {
global gdb_prompt
if [gdb_test "set language java" "" "set language java"] {
return 0
}
if [gdb_test "show language" ".* source language is \"java\".*"] {
return 0
}
return 1;
}
load_lib "java.exp"
proc test_comparisons {} {
global gdb_prompt
@ -56,5 +41,5 @@ gdb_test "set width 0" ""
if [set_lang_java] then {
test_comparisons
} else {
fail "Java expression tests suppressed"
warning "Java expression tests suppressed"
}

19
gdb/testsuite/gdb.java/jv-print.exp
View File

@ -21,23 +21,6 @@ load_lib "java.exp"
if { [skip_java_tests] } { continue }
# Set the current language to Java. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_java {} {
global gdb_prompt
if [gdb_test "set language java" "" "set language java"] {
return 0
}
if [gdb_test "show language" ".* source language is \"java\".*"] {
return 0
}
return 1;
}
proc test_integer_literals_accepted {} {
global gdb_prompt
@ -135,5 +118,5 @@ if [set_lang_java] then {
test_character_literals_accepted
test_integer_literals_rejected
} else {
fail "Java print command tests suppressed"
warning "Java print command tests suppressed"
}

18
gdb/testsuite/gdb.pascal/types.exp
View File

@ -23,23 +23,7 @@ if $tracelevel then {
strace $tracelevel
}
# Set the current language to pascal. This counts as a test. If it
# fails, then we skip the other tests.
proc set_lang_pascal {} {
global gdb_prompt
if [gdb_test "set language pascal" ""] {
return 0;
}
if ![gdb_test "show language" ".* source language is \"pascal\".*"] {
return 1;
} else {
return 0;
}
}
load_lib "pascal.exp"
proc test_integer_literal_types_accepted {} {
global gdb_prompt

30
gdb/testsuite/lib/fortran.exp Normal file
View File

@ -0,0 +1,30 @@
# This test code is part of GDB, the GNU debugger.
# Copyright 2010 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/>.
# Auxiliary function to set the language to fortran.
# The result is 1 (true) for success, 0 (false) for failure.
proc set_lang_fortran {} {
if [gdb_test_no_output "set language fortran"] {
return 0
}
if [gdb_test "show language" ".* source language is \"fortran\"." \
"set language to \"fortran\""] {
return 0
}
return 1;
}

14
gdb/testsuite/lib/java.exp
View File

@ -105,6 +105,20 @@ proc compile_java_from_source { srcfile binfile compile_args } {
return $result
}
# Auxiliary function to set the language to java.
# The result is 1 (true) for success, 0 (false) for failure.
proc set_lang_java {} {
if [gdb_test_no_output "set language java"] {
return 0
}
if [gdb_test "show language" ".* source language is \"java\"." \
"set language to \"java\""] {
return 0
}
return 1;
}
# Local Variables:
# tcl-indent-level:4
# End:

13
gdb/testsuite/lib/pascal.exp
View File

@ -150,3 +150,16 @@ proc gdb_compile_pascal {source dest type options} {
}
}
# Auxiliary function to set the language to pascal.
# The result is 1 (true) for success, 0 (false) for failure.
proc set_lang_pascal {} {
if [gdb_test_no_output "set language pascal"] {
return 0
}
if [gdb_test "show language" ".* source language is \"pascal\"." \
"set language to \"pascal\""] {
return 0
}
return 1;
}