| Message ID | 20221217000818.3729389-7-tom@tromey.com |
|---|---|
| State | Committed |
| Headers | |
| Series | Rewrite "require" test procedure and use it more often | |
Commit Message
diff --git a/gdb/testsuite/gdb.base/until-trailing-insns.exp b/gdb/testsuite/gdb.base/until-trailing-insns.exp index 56f6cf038e2..983b8290b47 100644 --- a/gdb/testsuite/gdb.base/until-trailing-insns.exp +++ b/gdb/testsuite/gdb.base/until-trailing-insns.exp @@ -79,10 +79,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - unsupported "dwarf2 support required for this test" - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp index e18f92eaa39..bbd710391aa 100644 --- a/gdb/testsuite/gdb.compile/compile-ops.exp +++ b/gdb/testsuite/gdb.compile/compile-ops.exp @@ -20,9 +20,7 @@ load_lib compile-support.exp load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dbg.S diff --git a/gdb/testsuite/gdb.cp/incomplete-type-overload.exp b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp index 024014d68ba..fdff30f3850 100644 --- a/gdb/testsuite/gdb.cp/incomplete-type-overload.exp +++ b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp @@ -22,7 +22,7 @@ load_lib dwarf.exp if { [skip_cplus_tests] } { return } -if { ![dwarf2_support] } { return } +require dwarf2_support standard_testfile .cc .S set asm_file [standard_output_file ${srcfile2}] diff --git a/gdb/testsuite/gdb.cp/namelessclass.exp b/gdb/testsuite/gdb.cp/namelessclass.exp index b9f5822995c..86d4a382444 100644 --- a/gdb/testsuite/gdb.cp/namelessclass.exp +++ b/gdb/testsuite/gdb.cp/namelessclass.exp @@ -24,9 +24,7 @@ if {[skip_cplus_tests]} { } # This test can only be run on x86-like targets which support DWARF. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { return 0 diff --git a/gdb/testsuite/gdb.cp/nsalias.exp b/gdb/testsuite/gdb.cp/nsalias.exp index 4daba1988c9..2ebf432dc8e 100644 --- a/gdb/testsuite/gdb.cp/nsalias.exp +++ b/gdb/testsuite/gdb.cp/nsalias.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if {[skip_cplus_tests]} { return diff --git a/gdb/testsuite/gdb.dlang/circular.exp b/gdb/testsuite/gdb.dlang/circular.exp index 7506e3bb5a4..de1b4d3c99e 100644 --- a/gdb/testsuite/gdb.dlang/circular.exp +++ b/gdb/testsuite/gdb.dlang/circular.exp @@ -18,12 +18,7 @@ load_lib "d-support.exp" load_lib "dwarf.exp" -if { [skip_d_tests] } { continue } - -# This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require !skip_d_tests dwarf2_support standard_testfile circular.c circular-dw.S diff --git a/gdb/testsuite/gdb.dlang/watch-loc.exp b/gdb/testsuite/gdb.dlang/watch-loc.exp index 6c786314063..4bf1caa3c5f 100644 --- a/gdb/testsuite/gdb.dlang/watch-loc.exp +++ b/gdb/testsuite/gdb.dlang/watch-loc.exp @@ -18,12 +18,7 @@ load_lib "d-support.exp" load_lib "dwarf.exp" -if { [skip_d_tests] } { return -1 } - -# This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require !skip_d_tests dwarf2_support standard_testfile watch-loc.c watch-loc-dw.S diff --git a/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp b/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp index 807bf86a5df..37fd74a2d58 100644 --- a/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp +++ b/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile ada-linkage-name.c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp index cad7d7a1d8a..e86d0afb172 100644 --- a/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp +++ b/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp b/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp index 781efd6a580..25e17477f7e 100644 --- a/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp +++ b/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp b/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp index 0da03669f7d..5ecbf6c78b7 100644 --- a/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp +++ b/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.exp b/gdb/testsuite/gdb.dwarf2/arr-stride.exp index a16abdff743..3fed02b3928 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-stride.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-stride.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp index fa2e89a4a4f..5c9b8a34951 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/atomic-type.exp b/gdb/testsuite/gdb.dwarf2/atomic-type.exp index b1cf848f794..adb90fcbab1 100644 --- a/gdb/testsuite/gdb.dwarf2/atomic-type.exp +++ b/gdb/testsuite/gdb.dwarf2/atomic-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp index 884bbb5b3ee..74c4deab4a5 100644 --- a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp +++ b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp index 455ed1b4d19..6f37cf46903 100644 --- a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp index c5c376bf889..bd2d0a75bc7 100644 --- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp +++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Test DW_OP_call_frame_cfa. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86 targets. if {![is_x86_like_target]} { return 0 diff --git a/gdb/testsuite/gdb.dwarf2/calling-convention.exp b/gdb/testsuite/gdb.dwarf2/calling-convention.exp index 8c87a69ebdf..172a667d542 100644 --- a/gdb/testsuite/gdb.dwarf2/calling-convention.exp +++ b/gdb/testsuite/gdb.dwarf2/calling-convention.exp @@ -27,9 +27,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/clang-cli-macro.exp b/gdb/testsuite/gdb.dwarf2/clang-cli-macro.exp index 3160532dfc3..2052cf30ce3 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-cli-macro.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-cli-macro.exp @@ -23,9 +23,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp b/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp index b1d7670ca87..26f8c50e272 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -debug.S -foo.c diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp index 22fdd740c6f..54c055172ce 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/clztest.exp b/gdb/testsuite/gdb.dwarf2/clztest.exp index 584a07138b6..2d40b1d3621 100644 --- a/gdb/testsuite/gdb.dwarf2/clztest.exp +++ b/gdb/testsuite/gdb.dwarf2/clztest.exp @@ -19,9 +19,7 @@ standard_testfile .S set test "clztest" # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp index 357c22b8238..426735e09cc 100644 --- a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp +++ b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.exp b/gdb/testsuite/gdb.dwarf2/corrupt.exp index 3b8100eb8e1..91d69cec74e 100644 --- a/gdb/testsuite/gdb.dwarf2/corrupt.exp +++ b/gdb/testsuite/gdb.dwarf2/corrupt.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/count.exp b/gdb/testsuite/gdb.dwarf2/count.exp index f930062cd7f..86895a6a68a 100644 --- a/gdb/testsuite/gdb.dwarf2/count.exp +++ b/gdb/testsuite/gdb.dwarf2/count.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # Only run on targets which support dwarf and gas. -if { ![dwarf2_support] } { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp index 59cfb3aa9c9..8dd2a9c096b 100644 --- a/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp +++ b/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp b/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp index 0c7b80d5f4f..04981e8b22c 100644 --- a/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp +++ b/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp @@ -19,9 +19,7 @@ load_lib "dwarf.exp" # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c cu-no-addrs.S diff --git a/gdb/testsuite/gdb.dwarf2/data-loc.exp b/gdb/testsuite/gdb.dwarf2/data-loc.exp index bbf5b9378b6..f16aa395db4 100644 --- a/gdb/testsuite/gdb.dwarf2/data-loc.exp +++ b/gdb/testsuite/gdb.dwarf2/data-loc.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp index 0e0e0cb893b..13efea12f63 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp @@ -17,10 +17,7 @@ load_lib dwarf.exp # Test with two aranges entries referring to the same CU. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp b/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp index 23dd4daf28f..1508f171a83 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile _start.c debug-names.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp b/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp index a79a60a6b5d..3e9bc665856 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile _start.c debug-names.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp b/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp index f70debd35ad..0a90813ae23 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile _start.c debug-names.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-non-ascending-cu.exp b/gdb/testsuite/gdb.dwarf2/debug-names-non-ascending-cu.exp index 53523eec46e..632261bc89e 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-names-non-ascending-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-names-non-ascending-cu.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile _start.c debug-names.S diff --git a/gdb/testsuite/gdb.dwarf2/debug-names.exp b/gdb/testsuite/gdb.dwarf2/debug-names.exp index e625c1fbb7a..4bce6cd7868 100644 --- a/gdb/testsuite/gdb.dwarf2/debug-names.exp +++ b/gdb/testsuite/gdb.dwarf2/debug-names.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile _start.c debug-names.S diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp index 930f35126b9..e6c690b8546 100644 --- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp +++ b/gdb/testsuite/gdb.dwarf2/dup-psym.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp index af9d12a9aeb..c1b63460846 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp index b30f6e51df5..052f711d2fd 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-align.exp b/gdb/testsuite/gdb.dwarf2/dw2-align.exp index 8e144ebc104..7a533708703 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-align.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-align.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp index a72be921610..91fa7f919ea 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if {[skip_cplus_tests]} { continue } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp index 4bdc55f58d4..a7f5748087d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp index 7b71ed1155e..17a5b59a27e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp @@ -30,9 +30,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -other.S -dwarf.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp index b6e1cc07368..8e6e18e83e1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp index bb538a68411..4fbbd4590bb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp index 6f0449bb7e9..6534a7afde5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -2.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index 8c58eaf8ae1..3718c5766e0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp b/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp index 0f6202e6431..5a24774592c 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp index b75f03cb7a6..bd6499619ba 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp index 4032e8be679..cdccee61e14 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp index 5e04cf9160e..d07890580a9 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp index 0766b9688ae..a3b363a5c2c 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp index 32a984971a0..6406224ba9a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp index b88645da17a..68d9aed8688 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp index 92f0e1350ec..6c503b182b3 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp @@ -21,9 +21,7 @@ if { [skip_cplus_tests] } { continue } load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S -main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp index 4ecfb5facf2..42084421418 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp # in the length of the CU. */ # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp index d9d34440b16..6a7194af379 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test has hard-wired assumptions that host and build filenames are # the same, and assumes POSIX pathname syntax. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp index 11cc347570a..14b72898015 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp @@ -25,9 +25,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp index c7f385b5600..910079993cf 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp @@ -14,9 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp index 1f73271859b..01d3c27719a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # introduced by GCC PR debug/40659. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp index bae266d013f..a4d76c97027 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp index 33509c10500..ba9044e47bb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86_64 targets. if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp index efe9da37882..53f8d1d4a3f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Test G++ 4.1 producing DW_TAG_namespace with DW_AT_name "::". # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp index 37ade8e099e..c37211d2e0e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp index 2eb145c6923..23be91df447 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [prepare_for_testing "failed to prepare" "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp index ae92fa58363..c7b3a4f28a8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp index 1a5ab7031cd..44b7541b8d4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Note: Inspired from dw2-basic.exp. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp b/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp index 956804f30b9..a4b7bc86f9b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile dw2-fixed-point.c dw2-fixed-point-dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp b/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp index e22d4439a09..ea29db5a0e1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This is GDB PR symtab/13277. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp index d3caf249060..dfff47dd11f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp index 7bf7d2bb85b..8b59850c2ac 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp index adb3660ee53..334874c148f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # introduced by GCC PR debug/40659. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp index 96fb9f331bc..177b324c5eb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86_64 targets. if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp index de33da9d8d4..aa7807e2427 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp @@ -53,9 +53,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp index 25d77263c0a..537d61dc88d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp @@ -48,9 +48,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp index fc4b228d5b6..96596d1f5f5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp @@ -37,9 +37,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp index e4f6b278aea..f77236a6b40 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp index c0675141012..97affa928ef 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S -main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp index a61f1625499..40f4233b5bc 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp @@ -27,9 +27,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp index b5e8957f107..65bc1fe23dc 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp index 61fd5d4fed8..e3d7a9c87e3 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp # This test can only be run on targets that support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index c813db6605e..c5e37442fbf 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index b55409b93c7..e3f5488093f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Intermixed 32-bit and 64-bit DWARF format tests. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp index 5176bd34b20..f8d3c1f68a6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp index 48dae27fa75..4d269a2d0f4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp index 8e11fa7ec71..7dc7586bd40 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp index 4af702ecc4a..26d6998d34d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp @@ -15,10 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp index 288c5a00176..38133ab6e22 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp @@ -21,9 +21,7 @@ if { [skip_cplus_tests] } { continue } load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp b/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp index 75d85d2a582..0e4432845d9 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp @@ -19,10 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp index 3e16e45adcc..7a002d4b412 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This testfile has reproducibility only with cc-with-index.sh. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp index 3d2890a56b2..1d52595fbbc 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp index c4e83e68ad5..3a04505b687 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp b/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp index 2cd11a00cee..e67de6e1134 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp index f9de2cffd20..26dd18d326a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [prepare_for_testing "failed to prepare" "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp index 2257dd22819..c58b2346964 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp index 128b0fc2e54..04d12a4da32 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Test DW_OP_call2 and DW_OP_call4, PR gdb/10640. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp index 3879c73552a..76ee7fbd370 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp set test "dw2-op-out-param" # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp index 9a3d0d6e1ab..b3d7d857d38 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp index 8f1a6fcb346..31afb3317f6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp @@ -24,9 +24,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp index 170500b6045..d03f6716d18 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp @@ -19,10 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp index da264c9916e..e7682cf27a6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S -main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp index b074e23990d..5bc19d77606 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp index 9ce97fc1f26..bea039686be 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp index 78962d56290..dec7d6a9b37 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp @@ -18,10 +18,7 @@ load_lib dwarf.exp # DW_AT_high_pc but with DW_AT_ranges instead. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp index 11f19f141a1..07ac5a9e52d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp @@ -17,10 +17,7 @@ load_lib dwarf.exp # Test DW_AT_ranges in the context of a subprogram scope. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - unsupported "dwarf2 support required for this test" - return 0 -} +require dwarf2_support if ![is_c_compiler_gcc] { unsupported "gcc required for this test" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp index 830258d3154..b528c3d73ce 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp @@ -22,10 +22,7 @@ load_lib dwarf.exp # instead. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp index 101a58e1394..d82f95c2785 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp @@ -18,10 +18,7 @@ load_lib dwarf.exp # Check psymtabs addrmaps generated from DW_AT_ranges of functions. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - unsupported "dwarf2 support required for this test" - return 0 -} +require dwarf2_support standard_testfile -main.c .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp index 824d7ba8085..770d2977a43 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp @@ -18,10 +18,7 @@ load_lib dwarf.exp # Test that psymbols are made when DW_AT_ranges is used. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - unsupported "dwarf2 support required for this test" - return 0 -} +require dwarf2_support if ![is_c_compiler_gcc] { unsupported "gcc required for this test" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp index b7b3223b587..d80d604edff 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp @@ -18,10 +18,7 @@ load_lib dwarf.exp # DW_AT_high_pc but with DW_AT_ranges instead. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp index e8448812e5b..f90defd480a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S -func.c -main.c lassign [function_range func_nofb \ diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp index 5f1fbe728cf..470015f6bbb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86_64 targets. if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp index 3b4e07a8e78..448b1e447f0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # in DWARF. clang-3.5.0-9.fc22.x86_64 produced it inside DW_AT_location. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp index fd524d3f95d..974eb05f57b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp b/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp index 86304b45c5a..7e77708eafa 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp index 5824d8b3426..f0846e7bd01 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp index b8ff89eb4c2..d9a4014148e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp @@ -32,9 +32,7 @@ load_lib dwarf.exp # end of main func_end # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp index e10f37ad665..a05c02664de 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp index b2d5763c539..cf9c77741a2 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp @@ -28,10 +28,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp index c89d71eb7d8..bd8c6781e49 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # are unreferenced in code, and whose contents appear in .debug_str. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp index 6c6d5fe46b4..99dd4ec8073 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp index 014797e108b..74105ce76d6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp standard_testfile .S # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp index 535f212e7f8..9ba8c45ae63 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp index 20c31dc5740..cc945fdb8b3 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -foo.c dwz.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp index 6c716308d8e..ccc0757ba46 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp @@ -30,9 +30,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S set asm_file [standard_output_file $srcfile2] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp index 4d1c49044d5..385bacf0035 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp index 7eb985262a4..ba72d8e234f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S main.c diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp index 24299d45459..035d4902ab4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp @@ -15,10 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support # The .c files use __attribute__. if ![is_c_compiler_gcc] { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp b/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp index 11a36583c7d..291396b9c97 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp @@ -23,9 +23,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { } # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp index 97c1ed83278..5248da6e491 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp @@ -19,10 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - verbose "Skipping $gdb_test_file_name." - return 0 -} +require dwarf2_support if {[skip_shlib_tests]} { return 0 diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp index 979e78464f2..25334c55f54 100644 --- a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp +++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp index 578a1f549b2..6d171bc71d8 100644 --- a/gdb/testsuite/gdb.dwarf2/dwz.exp +++ b/gdb/testsuite/gdb.dwarf2/dwz.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c dwz.S diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp index c4faea649d2..9177a87d264 100644 --- a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp +++ b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # No remote host testing either. if {[is_remote host]} { diff --git a/gdb/testsuite/gdb.dwarf2/dwznolink.exp b/gdb/testsuite/gdb.dwarf2/dwznolink.exp index fe3e1e6835a..3ff7fd07458 100644 --- a/gdb/testsuite/gdb.dwarf2/dwznolink.exp +++ b/gdb/testsuite/gdb.dwarf2/dwznolink.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # No remote host testing either. if {[is_remote host]} { diff --git a/gdb/testsuite/gdb.dwarf2/dyn-type-unallocated.exp b/gdb/testsuite/gdb.dwarf2/dyn-type-unallocated.exp index 3192ea7820c..8ad8b63d5de 100644 --- a/gdb/testsuite/gdb.dwarf2/dyn-type-unallocated.exp +++ b/gdb/testsuite/gdb.dwarf2/dyn-type-unallocated.exp @@ -34,9 +34,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp index 83a5fccd831..e5c3a93f74d 100644 --- a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp index 69ac417f38c..588d28902ec 100644 --- a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -}; +require dwarf2_support; standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/enum-type.exp b/gdb/testsuite/gdb.dwarf2/enum-type.exp index 983b415bfdb..b7705c84c33 100644 --- a/gdb/testsuite/gdb.dwarf2/enum-type.exp +++ b/gdb/testsuite/gdb.dwarf2/enum-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp b/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp index 53150237408..6ba587b612f 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp index 1bdfc4c94bb..576f3dbb0ba 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-base.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp @@ -21,9 +21,7 @@ if [is_remote host] { } # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp index f21f9bbcd36..08d230da443 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp @@ -26,9 +26,7 @@ if [is_remote host] { } # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp index 1df0fa7714f..9c953139fcf 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp @@ -21,9 +21,7 @@ if [is_remote host] { } # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/fission-mix.exp b/gdb/testsuite/gdb.dwarf2/fission-mix.exp index 99887075c03..f7327e8329a 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-mix.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-mix.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support standard_testfile .c -2.c set objfile [standard_output_file ${testfile}.o] diff --git a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp index 62bffdf709d..577840334d7 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp @@ -24,9 +24,7 @@ if [is_remote host] { } # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We place the entire source code for the test into a single .c file, # but we generate the DWARF in two separate .S files. Each .S is diff --git a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp index 3b548c4e8b5..bee99956078 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.exp b/gdb/testsuite/gdb.dwarf2/fission-reread.exp index 4d6d9ed20a6..ab7253fa8ac 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-reread.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-reread.exp @@ -21,9 +21,7 @@ if [is_remote host] { } # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/formdata16.exp b/gdb/testsuite/gdb.dwarf2/formdata16.exp index 9ef9a6ee3f1..be4aaa7423d 100644 --- a/gdb/testsuite/gdb.dwarf2/formdata16.exp +++ b/gdb/testsuite/gdb.dwarf2/formdata16.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp b/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp index 793c4418fd6..9f92358511f 100644 --- a/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp +++ b/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp b/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp index cb208c430db..ee657d74ec4 100644 --- a/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp @@ -30,9 +30,7 @@ require !use_gdb_stub load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp index 9050482ad3e..eab5ae5ccbd 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index 013eca7c50b..540cb5bc35e 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp index 5badcaccb1b..31105c1f93f 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp index 74bd017a1f3..f5fc1c0b972 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c diff --git a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp index 881af105a50..fd3712b0574 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S set executable ${testfile} diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp index db3b1e50620..a40c6be5e1d 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Test DW_OP_GNU_implicit_pointer. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set csrcfile ${testfile}.c diff --git a/gdb/testsuite/gdb.dwarf2/implptrconst.exp b/gdb/testsuite/gdb.dwarf2/implptrconst.exp index 8a725d81354..3c1cc7c4371 100644 --- a/gdb/testsuite/gdb.dwarf2/implptrconst.exp +++ b/gdb/testsuite/gdb.dwarf2/implptrconst.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/implptrpiece.exp b/gdb/testsuite/gdb.dwarf2/implptrpiece.exp index e184cb3212c..8441f3fbb96 100644 --- a/gdb/testsuite/gdb.dwarf2/implptrpiece.exp +++ b/gdb/testsuite/gdb.dwarf2/implptrpiece.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/implref-array.exp b/gdb/testsuite/gdb.dwarf2/implref-array.exp index d9ddf602bb7..e149b7caeb7 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-array.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-array.exp @@ -23,9 +23,7 @@ if [skip_cplus_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We'll place the output of Dwarf::assemble in implref-array.S. standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/implref-const.exp b/gdb/testsuite/gdb.dwarf2/implref-const.exp index c25fc7e9bf3..8e2483bf542 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-const.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-const.exp @@ -23,9 +23,7 @@ if [skip_cplus_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We'll place the output of Dwarf::assemble in implref-const.S. standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/implref-global.exp b/gdb/testsuite/gdb.dwarf2/implref-global.exp index b4f3035cc36..9dd2bd343a0 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-global.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-global.exp @@ -23,9 +23,7 @@ if [skip_cplus_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We'll place the output of Dwarf::assemble in implref-global.S. standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/implref-struct.exp b/gdb/testsuite/gdb.dwarf2/implref-struct.exp index 10358df68b7..2e4456a902c 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-struct.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-struct.exp @@ -23,9 +23,7 @@ if [skip_cplus_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We'll place the output of Dwarf::assemble in implref-struct.S. standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp index e0b0baf36c4..fe25330573d 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -}; +require dwarf2_support; standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-c.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-c.exp index 14047ab8eb9..83e4fc0643e 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-c.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-c.exp @@ -1,9 +1,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -}; +require dwarf2_support; standard_testfile main-foo.c .S diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index 02450aac074..57f63b75cdb 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -}; +require dwarf2_support; standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit.exp b/gdb/testsuite/gdb.dwarf2/imported-unit.exp index ecaa0e13af8..7c81c2a0a4e 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit.exp @@ -29,9 +29,7 @@ if [skip_cplus_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -}; +require dwarf2_support; standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp index b41b10410c5..cdb69fc2079 100644 --- a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/inlined_subroutine-inheritance.exp b/gdb/testsuite/gdb.dwarf2/inlined_subroutine-inheritance.exp index d92a90840ae..2193eb9b7d9 100644 --- a/gdb/testsuite/gdb.dwarf2/inlined_subroutine-inheritance.exp +++ b/gdb/testsuite/gdb.dwarf2/inlined_subroutine-inheritance.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/intbits.exp b/gdb/testsuite/gdb.dwarf2/intbits.exp index 19752d333dc..790062e58a3 100644 --- a/gdb/testsuite/gdb.dwarf2/intbits.exp +++ b/gdb/testsuite/gdb.dwarf2/intbits.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp index 89605cb5f00..48d304a39d7 100644 --- a/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp +++ b/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Test with 32-bit and 64-bit DWARF. foreach_with_prefix is_64 {false true} { diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp index 368f63c1a63..270a03b7568 100644 --- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp +++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp @@ -56,9 +56,7 @@ if [skip_shlib_tests] { load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # gdb_test_file_name is the name of this file without the .exp # extension. Use it to form basenames for the main program diff --git a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp index 00bdeaf0ef4..f08d4ad036d 100644 --- a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp +++ b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Test with 32-bit and 64-bit DWARF. foreach_with_prefix is_64 {false true} { diff --git a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp index f48eaa10863..7cacf7c5eea 100644 --- a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp +++ b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Test with 32-bit and 64-bit DWARF. foreach_with_prefix is_64 {false true} { diff --git a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp index 5af79e4ec1e..574ab43c7fb 100644 --- a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp +++ b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Test with 32-bit and 64-bit DWARF. foreach_with_prefix is_64 {false true} { diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp index 9f75fd9c90c..5bae5f99cee 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # bogus file numbers. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S set dwarf_srcfile "file1.txt" diff --git a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp index 8743eddd612..cba5fc4768a 100644 --- a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp +++ b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c diff --git a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp index 14adf66fba9..ad714d2f29b 100644 --- a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp +++ b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-4 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [use_gdb_stub] } { unsupported "test requires running" diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp index f7cbd71a4b6..5f6b1c81c96 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/method-ptr.exp b/gdb/testsuite/gdb.dwarf2/method-ptr.exp index 2577791b70d..3998b61aa68 100644 --- a/gdb/testsuite/gdb.dwarf2/method-ptr.exp +++ b/gdb/testsuite/gdb.dwarf2/method-ptr.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp index 34c653f4fec..e4cefd061b8 100644 --- a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp +++ b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/missing-type-name-for-templates.exp b/gdb/testsuite/gdb.dwarf2/missing-type-name-for-templates.exp index 14339c86ded..29b8cfa5021 100644 --- a/gdb/testsuite/gdb.dwarf2/missing-type-name-for-templates.exp +++ b/gdb/testsuite/gdb.dwarf2/missing-type-name-for-templates.exp @@ -21,9 +21,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .cc .S diff --git a/gdb/testsuite/gdb.dwarf2/missing-type-name.exp b/gdb/testsuite/gdb.dwarf2/missing-type-name.exp index 6fff1e0667b..b8e94b17558 100644 --- a/gdb/testsuite/gdb.dwarf2/missing-type-name.exp +++ b/gdb/testsuite/gdb.dwarf2/missing-type-name.exp @@ -33,9 +33,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile void-type.c void-type.S diff --git a/gdb/testsuite/gdb.dwarf2/multidictionary.exp b/gdb/testsuite/gdb.dwarf2/multidictionary.exp index df7dcb9266a..0d5ebfdfbbb 100644 --- a/gdb/testsuite/gdb.dwarf2/multidictionary.exp +++ b/gdb/testsuite/gdb.dwarf2/multidictionary.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/negative-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/negative-data-member-location.exp index 57030d77134..65080174b60 100644 --- a/gdb/testsuite/gdb.dwarf2/negative-data-member-location.exp +++ b/gdb/testsuite/gdb.dwarf2/negative-data-member-location.exp @@ -22,9 +22,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if { ![dwarf2_support] } { - return 0 -} +require dwarf2_support standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp b/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp index 73f7233192e..bf754e166f7 100644 --- a/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp +++ b/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # No remote host testing either. if {[is_remote host]} { diff --git a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp index 714d33155e3..08e63032e42 100644 --- a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp +++ b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp @@ -19,7 +19,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { return 0 } +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp index 49aa78b6c75..36f82191ca3 100644 --- a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp +++ b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp index c5601df8e46..c66977996c4 100644 --- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp +++ b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -1.S -2.c diff --git a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp index 5066bae736a..2f3514e6882 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # Test some DWARF piece operators. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86 targets. if {![is_x86_like_target]} { return 0 diff --git a/gdb/testsuite/gdb.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp index 118c00c7ecb..e464a4fb6f4 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # Test some DWARF piece operators. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86 targets. if {![is_x86_like_target]} { return 0 diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.exp b/gdb/testsuite/gdb.dwarf2/pr11465.exp index 7aca65f6eeb..bc28bf30d64 100644 --- a/gdb/testsuite/gdb.dwarf2/pr11465.exp +++ b/gdb/testsuite/gdb.dwarf2/pr11465.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S diff --git a/gdb/testsuite/gdb.dwarf2/pr13961.exp b/gdb/testsuite/gdb.dwarf2/pr13961.exp index 2c92c87642d..1f6808a3f4f 100644 --- a/gdb/testsuite/gdb.dwarf2/pr13961.exp +++ b/gdb/testsuite/gdb.dwarf2/pr13961.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] diff --git a/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp index 0625eb93b1f..8e61efd706c 100644 --- a/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp +++ b/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp @@ -26,9 +26,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Test with 32-bit and 64-bit DWARF. foreach_with_prefix is_64 {false true} { diff --git a/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp index 33552823847..9efafcd6769 100644 --- a/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp +++ b/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support foreach_with_prefix is_64 {false true} { if { $is_64 } { diff --git a/gdb/testsuite/gdb.dwarf2/shortpiece.exp b/gdb/testsuite/gdb.dwarf2/shortpiece.exp index f5a933e521b..27dd24fffec 100644 --- a/gdb/testsuite/gdb.dwarf2/shortpiece.exp +++ b/gdb/testsuite/gdb.dwarf2/shortpiece.exp @@ -16,9 +16,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp index 01b43bc93f1..02723cb574d 100644 --- a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp +++ b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/struct-decl.exp b/gdb/testsuite/gdb.dwarf2/struct-decl.exp index 739eaaabb2b..09c4e9ac10e 100644 --- a/gdb/testsuite/gdb.dwarf2/struct-decl.exp +++ b/gdb/testsuite/gdb.dwarf2/struct-decl.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -debug.S diff --git a/gdb/testsuite/gdb.dwarf2/struct-with-sig.exp b/gdb/testsuite/gdb.dwarf2/struct-with-sig.exp index 66021b70fb2..34be5e60d96 100644 --- a/gdb/testsuite/gdb.dwarf2/struct-with-sig.exp +++ b/gdb/testsuite/gdb.dwarf2/struct-with-sig.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main-foo.c .S diff --git a/gdb/testsuite/gdb.dwarf2/subrange-enum.exp b/gdb/testsuite/gdb.dwarf2/subrange-enum.exp index b9f7cb68233..d835fb9a791 100644 --- a/gdb/testsuite/gdb.dwarf2/subrange-enum.exp +++ b/gdb/testsuite/gdb.dwarf2/subrange-enum.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/subrange.exp b/gdb/testsuite/gdb.dwarf2/subrange.exp index bf3b3f711fe..6b6e047ef01 100644 --- a/gdb/testsuite/gdb.dwarf2/subrange.exp +++ b/gdb/testsuite/gdb.dwarf2/subrange.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if { [skip_cplus_tests] } { continue } diff --git a/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_fail.exp b/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_fail.exp index 427cc5ebc76..3c1da88c5f9 100644 --- a/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_fail.exp +++ b/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_fail.exp @@ -23,9 +23,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Choose suitable integer registers for the test. diff --git a/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_timeout.exp b/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_timeout.exp index 312865ad8f7..adf56d46f35 100644 --- a/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_timeout.exp +++ b/gdb/testsuite/gdb.dwarf2/symbol_needs_eval_timeout.exp @@ -23,9 +23,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Choose suitable integer registers for the test. diff --git a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp index b37bafaba07..bff53ddfc24 100644 --- a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp load_lib gdb-python.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can also only be run when we have python support in gdb, # but that test can only be done after gdb has started, below. diff --git a/gdb/testsuite/gdb.dwarf2/template-specification-full-name.exp b/gdb/testsuite/gdb.dwarf2/template-specification-full-name.exp index e99d4d03166..a2a1dc6d856 100644 --- a/gdb/testsuite/gdb.dwarf2/template-specification-full-name.exp +++ b/gdb/testsuite/gdb.dwarf2/template-specification-full-name.exp @@ -22,9 +22,7 @@ load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/trace-crash.exp b/gdb/testsuite/gdb.dwarf2/trace-crash.exp index 33a0517c22f..83d690fed0d 100644 --- a/gdb/testsuite/gdb.dwarf2/trace-crash.exp +++ b/gdb/testsuite/gdb.dwarf2/trace-crash.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp load_lib trace-support.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86-64 targets. if {![istarget x86_64-*] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp index 5abd575bc5b..06b8a4e2dc1 100644 --- a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp +++ b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp set test "typeddwarf" # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86 and amd64 targets (and not x32). if { [is_x86_like_target] } { diff --git a/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp b/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp index ade9e5d0a75..86871ce6267 100644 --- a/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp +++ b/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp load_lib gdb-python.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile void-type.c .S diff --git a/gdb/testsuite/gdb.dwarf2/utf-rust.exp b/gdb/testsuite/gdb.dwarf2/utf-rust.exp index 93b58693060..8a3e5f0e4aa 100644 --- a/gdb/testsuite/gdb.dwarf2/utf-rust.exp +++ b/gdb/testsuite/gdb.dwarf2/utf-rust.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile main.c .S diff --git a/gdb/testsuite/gdb.dwarf2/valop.exp b/gdb/testsuite/gdb.dwarf2/valop.exp index 4853d59ae41..9e6eccdbdd4 100644 --- a/gdb/testsuite/gdb.dwarf2/valop.exp +++ b/gdb/testsuite/gdb.dwarf2/valop.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp # Test DW_OP_stack_value and DW_OP_implicit_value. # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86 targets. if {![is_x86_like_target]} { return 0 diff --git a/gdb/testsuite/gdb.dwarf2/var-access.exp b/gdb/testsuite/gdb.dwarf2/var-access.exp index 4b8a2d779c2..5eb8f5aa6a3 100644 --- a/gdb/testsuite/gdb.dwarf2/var-access.exp +++ b/gdb/testsuite/gdb.dwarf2/var-access.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # Choose suitable integer registers for the test. diff --git a/gdb/testsuite/gdb.dwarf2/variant.exp b/gdb/testsuite/gdb.dwarf2/variant.exp index e6221c8f499..b36c8133588 100644 --- a/gdb/testsuite/gdb.dwarf2/variant.exp +++ b/gdb/testsuite/gdb.dwarf2/variant.exp @@ -19,9 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use # gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/varval.exp b/gdb/testsuite/gdb.dwarf2/varval.exp index cb02bc34537..ad84a4454ac 100644 --- a/gdb/testsuite/gdb.dwarf2/varval.exp +++ b/gdb/testsuite/gdb.dwarf2/varval.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # We'll place the output of Dwarf::assemble in varval.S. standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/void-type.exp b/gdb/testsuite/gdb.dwarf2/void-type.exp index cafed8cdd5a..ebe3a61f437 100644 --- a/gdb/testsuite/gdb.dwarf2/void-type.exp +++ b/gdb/testsuite/gdb.dwarf2/void-type.exp @@ -27,9 +27,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c .S diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp index 498648bd768..c4768324653 100644 --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp +++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp @@ -17,9 +17,7 @@ load_lib dwarf.exp set test "watch-notconst" # This test can only be run on targets which support DWARF-2 and use gas. -if ![dwarf2_support] { - return 0 -} +require dwarf2_support # This test can only be run on x86 targets. if { ![is_x86_like_target] } { diff --git a/gdb/testsuite/gdb.linespec/break-asm-file.exp b/gdb/testsuite/gdb.linespec/break-asm-file.exp index 6660c9ef336..07515ec4d4f 100644 --- a/gdb/testsuite/gdb.linespec/break-asm-file.exp +++ b/gdb/testsuite/gdb.linespec/break-asm-file.exp @@ -24,9 +24,7 @@ set asm_file1 break-asm-file1.s set asm_file0 break-asm-file0.s # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \ object {debug nowarnings optimize=-O0}] != ""} { diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp index 6c7f12d152f..4089a993764 100644 --- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp @@ -18,9 +18,7 @@ load_lib dwarf.exp load_lib mi-support.exp set MIFLAGS "-i=mi" -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .S dw2-ref-missing-frame-func.c dw2-ref-missing-frame-main.c set objsfile [standard_output_file ${testfile}.o] diff --git a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp index 59f3effc1b7..e610c358954 100644 --- a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp +++ b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp @@ -17,9 +17,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi" # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support # This test can only be run on x86_64 targets. if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index 07f87aa5885..beff2dfe4c9 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -15,9 +15,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c entry-values-dw.S diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp index d73b9f1e33f..c4c6f3373e8 100644 --- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp +++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp @@ -16,9 +16,7 @@ load_lib "trace-support.exp" load_lib dwarf.exp -if {![dwarf2_support]} { - return 0 -} +require dwarf2_support standard_testfile .c -dbg.S