From 0ebbc52beef41c725f75b22c80a37fee00303bb0 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 24 Aug 2015 15:29:49 +0100 Subject: [PATCH] gdb/testsuite/: garbage collect a few references to dead targets gdb/testsuite/ChangeLog: 2015-08-24 Pedro Alves * config/m32r-stub.exp: Remove file. * gdb.base/call-ar-st.exp: Remove reference to sparclet. * gdb.base/call-rt-st.exp: Likewise. * gdb.base/call-strs.exp: Likewise. * gdb.base/default.exp: Remove references to h8300-*-hms and *-*-udi*. * gdb.base/funcargs.exp: Remove reference to sparclet-*-*. --- gdb/testsuite/ChangeLog | 10 ++++++++ gdb/testsuite/config/m32r-stub.exp | 1 - gdb/testsuite/gdb.base/call-ar-st.exp | 5 ---- gdb/testsuite/gdb.base/call-rt-st.exp | 5 ---- gdb/testsuite/gdb.base/call-strs.exp | 5 ---- gdb/testsuite/gdb.base/default.exp | 33 +++++++++++---------------- gdb/testsuite/gdb.base/funcargs.exp | 22 ++++++++---------- 7 files changed, 32 insertions(+), 49 deletions(-) delete mode 100644 gdb/testsuite/config/m32r-stub.exp diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 68756272d96..c3d5182d1e5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2015-08-24 Pedro Alves + + * config/m32r-stub.exp: Remove file. + * gdb.base/call-ar-st.exp: Remove reference to sparclet. + * gdb.base/call-rt-st.exp: Likewise. + * gdb.base/call-strs.exp: Likewise. + * gdb.base/default.exp: Remove references to h8300-*-hms and + *-*-udi*. + * gdb.base/funcargs.exp: Remove reference to sparclet-*-*. + 2015-08-24 Andreas Arnez * gdb.base/gnu_vector.exp: Try compilation with "-mcpu=native diff --git a/gdb/testsuite/config/m32r-stub.exp b/gdb/testsuite/config/m32r-stub.exp deleted file mode 100644 index cd04787ddb6..00000000000 --- a/gdb/testsuite/config/m32r-stub.exp +++ /dev/null @@ -1 +0,0 @@ -load_lib "../../testsuite/config/sparclet.exp" diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp index 0f326e025be..de0ad941a56 100644 --- a/gdb/testsuite/gdb.base/call-ar-st.exp +++ b/gdb/testsuite/gdb.base/call-ar-st.exp @@ -19,11 +19,6 @@ standard_testfile -# Test depends on printf, which the sparclet stub doesn't support. -if { [istarget "sparclet-*-*"] } { - return 0 -} - # Some targets can't call functions, so don't even bother with this # test. if [target_info exists gdb,cannot_call_functions] { diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp index 46cdfa9e066..ea895a02f86 100644 --- a/gdb/testsuite/gdb.base/call-rt-st.exp +++ b/gdb/testsuite/gdb.base/call-rt-st.exp @@ -23,11 +23,6 @@ standard_testfile .c -# Test depends on printf, which the sparclet stub doesn't support. -if { [istarget "sparclet-*-*"] } { - return 0 -} - if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { untested "couldn't compile ${srcdir}/${subdir}/${srcfile}" return -1 diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp index 96641e53283..798a9393479 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -25,11 +25,6 @@ standard_testfile -# Test depends on printf, which the sparclet stub doesn't support. -if { [istarget "sparclet-*-*"] } { - return 0 -} - # Some targets can't call functions, so don't even bother with this # test. if [target_info exists gdb,cannot_call_functions] { diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index e682023be6e..4395c98219a 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -117,11 +117,6 @@ gdb_test "delete display" \ #test detach gdb_test "detach" ".*" "detach" -if [istarget "h8300-*-hms"] then { - gdb_exit - gdb_start -} - #test directory # FIXME -- need to dump full output to detailed log @@ -209,7 +204,7 @@ gdb_test "f" "No stack." "frame \"f\" abbreviation" gdb_test "frame" "No stack." "frame" #test fg gdb_test "fg" "The program is not being run." "fg" -# FIXME: fg kills the udi connection + #test file send_gdb "file\n" gdb_expect { @@ -773,22 +768,20 @@ gdb_expect { } #test target remote -if ![istarget "*-*-udi*"] then { - send_gdb "target remote\n" - gdb_expect { - -re "To open a remote debug connection, you need to specify what.*serial.*device is attached to the remote system.*.e.g. .*$gdb_prompt $"\ - { pass "target remote" } - -re ".*A program is being debugged already. Kill it. .y or n.*$" { - send_gdb "n\n" - if $verbose>1 then { - send_user "\t\tDidn't kill program being debugged\n" - } - gdb_expect -re "$gdb_prompt $" { } - pass "target remote" +send_gdb "target remote\n" +gdb_expect { + -re "To open a remote debug connection, you need to specify what.*serial.*device is attached to the remote system.*.e.g. .*$gdb_prompt $"\ + { pass "target remote" } + -re ".*A program is being debugged already. Kill it. .y or n.*$" { + send_gdb "n\n" + if $verbose>1 then { + send_user "\t\tDidn't kill program being debugged\n" } - -re ".*$gdb_prompt $" { fail "target remote" } - timeout { fail "(timeout) target remote" } + gdb_expect -re "$gdb_prompt $" { } + pass "target remote" } + -re ".*$gdb_prompt $" { fail "target remote" } + timeout { fail "(timeout) target remote" } } #test target diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp index 6cafc999268..4cc92f45d0f 100644 --- a/gdb/testsuite/gdb.base/funcargs.exp +++ b/gdb/testsuite/gdb.base/funcargs.exp @@ -894,19 +894,15 @@ proc recursive_structs_by_value {} { gdb_run_cmd gdb_test "" "Breakpoint $decimal, hitbottom .*" "run to hitbottom" - if ![istarget sparclet-*-*] { - gdb_test_sequence "backtrace 100" "recursive passing of structs by value" { - "\[\r\n\]#0 .* hitbottom \\(\\) " - "\[\r\n\]#1 .* recurse \\(a=\{s = 0, i = 0, l = 0\}, depth=0\\) " - "\[\r\n\]#2 .* recurse \\(a=\{s = 1, i = 1, l = 1\}, depth=1\\) " - "\[\r\n\]#3 .* recurse \\(a=\{s = 2, i = 2, l = 2\}, depth=2\\) " - "\[\r\n\]#4 .* recurse \\(a=\{s = 3, i = 3, l = 3\}, depth=3\\) " - "\[\r\n\]#5 .* recurse \\(a=\{s = 4, i = 4, l = 4\}, depth=4\\) " - "\[\r\n\]#6 .* test_struct_args \\(\\) " - "\[\r\n\]#7 .* main \\(.*\\) at " - } - } else { - fail "recursive passing of structs by value (sparclet)" + gdb_test_sequence "backtrace 100" "recursive passing of structs by value" { + "\[\r\n\]#0 .* hitbottom \\(\\) " + "\[\r\n\]#1 .* recurse \\(a=\{s = 0, i = 0, l = 0\}, depth=0\\) " + "\[\r\n\]#2 .* recurse \\(a=\{s = 1, i = 1, l = 1\}, depth=1\\) " + "\[\r\n\]#3 .* recurse \\(a=\{s = 2, i = 2, l = 2\}, depth=2\\) " + "\[\r\n\]#4 .* recurse \\(a=\{s = 3, i = 3, l = 3\}, depth=3\\) " + "\[\r\n\]#5 .* recurse \\(a=\{s = 4, i = 4, l = 4\}, depth=4\\) " + "\[\r\n\]#6 .* test_struct_args \\(\\) " + "\[\r\n\]#7 .* main \\(.*\\) at " } gdb_stop_suppressing_tests }