From: Tom Tromey Date: Tue, 13 Dec 2022 22:21:57 +0000 (-0700) Subject: Use require dwarf2_support X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce8d533e88bea858ad96011683469d182a22e355;p=binutils-gdb.git Use require dwarf2_support This changes some tests to use "require dwarf2_support". --- diff --git a/gdb/testsuite/gdb.base/until-trailing-insns.exp b/gdb/testsuite/gdb.base/until-trailing-insns.exp index a68ea995125..00386923a28 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 0cc84112a3a..3935d472389 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 db7b06eec6f..a2b60e5c3e1 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 40e71d0b19a..bf4748cd4d3 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 18abdbe0511..19a36b87df5 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 102e1b8469a..e2b0b8ad691 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 8aaf79d04c1..4b240b13fcf 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 9ca63bad703..a01cdfec29f 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 18f732576ca..e8052205ccd 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 729ade94a71..d340fa5fa16 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 cc4c903c331..89e1f76ec79 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 d572c03123e..ea036517477 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 9f9abdc6c86..d5d9041fced 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 10e962184b6..7e5a32a2642 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 c564d486b98..de9905e304d 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 df675c7c812..a1e4d974f72 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 85830a44ee2..4242e08a296 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 0002001906e..4a3c0a55d8c 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 a83638a06f1..a24112ad841 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 8a2a2bdad91..7bc46ce6531 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 dde52e4b2cc..d6ee18b0898 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 f089b94f344..75dfb15ec20 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 a19986a7a60..ba8c2728747 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 a7822f86cdd..5966cfbb831 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 ffff96bfc11..0f13fb350f3 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 cc207ecea9d..1caae93f232 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 0cdc9e04ec0..b2ce802a4b1 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 475de3184bd..4ab29ec3030 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 187eb57281c..4e8ce14defb 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 bdee91e1fc1..adb302ee33a 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 0f26497933c..ca57ecbfc70 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 90e1afb746a..5af32c8d6f2 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 7830e2f3fe2..d866a3c502b 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 e7a032e3b9b..f718de78f98 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 4d470f36ea6..cf7892a3974 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 397cb38ceef..2ec3d11d8ac 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 7d67f9c8a47..78a344398b6 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 aa54d482c17..c3e1eddd8bb 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 c4985e0a49c..96266867dd5 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 71cedcbebc1..50a229fcbe0 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 cfc3cffe665..185d96c2816 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 d8c60416d9f..802103da3fe 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 990a3771dd1..3d2c16459c5 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 6b3b4a72e2e..f4a349dc6ca 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 9020e40a1e3..9f3a05e47a7 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 bb66fe754ee..79058cafe7f 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 c98ee2a15b5..97674effc49 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 3070c383c08..43dec8de2a8 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 b56c2794688..58e1eccf27c 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 6012d0f342c..a68307a4ce6 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 dec6873a1e3..1e87f670d45 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 e8e16196e97..80eb5fff92d 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 5c2ebde6503..f0baf76bf4e 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 23b66a7e2af..e559f52dc0a 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 977e541a1c9..2f37d4d7955 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 d931b28b690..5a92fdf16d0 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 37da078f5b5..58792e130f7 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 . 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 3654dba1b9b..01c5d1ca1e5 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 4e5a50c8a6d..ec7522df533 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 f9b1abbbc18..262b9728527 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 d9a51f369fd..99c6a0061aa 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 57b1567f7a1..d154a93ce48 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 187ad8ac893..72525029981 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 93378929165..0980f43078f 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 579b68d4462..3bdac4c1cb8 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 b172ef5e103..28381791c76 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 357717d2d52..36925da5d6d 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 b07070f7141..5f719d40116 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 cb84bc1f0c7..6529effd6f0 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 2e246141e30..1c0ab5d0fcd 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 53d905dfd4f..bdd7070dca2 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 bc64c8a31fd..3293d6152c0 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 7325ec6d97f..5caa9cc9469 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 ca18231d9f7..b98d6003c96 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 7c33f432291..9f5007765eb 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 886b9cb64a2..cf81c0fa95b 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 973118589df..c3120a28223 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 addb6f36e77..87c70a4e1fc 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 14b2709737e..fb1c5605e9b 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 2cea30fc926..f5e5f80aa26 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 dae8ea391ba..03d18cc0cda 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 904befed535..7e9151da73f 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 dd949a9026f..74faf112594 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 e696b495f53..ac0f4d374b5 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 0f9d3df96ed..2b473776599 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 dec27901ac8..510631c0364 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 1e22e25c048..317ea21574e 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 4aedfc545c3..8e3f1517988 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 92353ca487e..8f8dac6f94f 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 3a1818da868..a76d9653bad 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 c13e502d547..5ee799b73c9 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 e7769e08e33..b10050f59b0 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 2589b76aa2b..dd461c33d38 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 500eb031400..c1de099317f 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 ce028349109..535e74d255d 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 a3fcd6808ea..17ccb648de2 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 7298097ce6c..ae6c58f2434 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 03b1346660a..5e44badb179 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 683349d256e..3d1fe8909f0 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 12944a81f0c..ad45bbd94b5 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 3ab12cdcaf2..0cbdaa01cc5 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 58d62f9e588..6fd837c97df 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 8aefbc9e0ee..7db7cd2e3f6 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 f6560509ffc..bb92d7e66d6 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 032e0c8db59..79da50db77c 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 d82f700c94c..e195969fd68 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 2fff9adc5e8..de272c875fd 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 5a722b7a249..d9a552a8c9d 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 1dfde9f2cd8..06dd4dc3723 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 574e4c42739..a5258821df0 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 93a38ad4a55..d51cb8e0b7a 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 5dd4707b004..083c8026fd3 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 0ecf22de0de..dfb531371eb 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 7a1f3a401fc..966de06fe17 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 7befe1c850b..a3b9dd075e1 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 11092f95934..5073611e230 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 a85378282c9..2bbd66444a1 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 cac6e14d874..9d81155b5b0 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 0181a612eb6..e532c4cb8f2 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 95d76454236..9f6a4ac251b 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 a353395592e..5fa6ee544b2 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 531ebcdd80f..b94f5c95fe0 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 f11d5297462..e921c105d0d 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 64aacd8fd7c..2b4fd0e3995 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 19aaea98a65..c5a59f04aa8 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 2cedd0257e1..63e75fb6343 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 6309360355c..733116f18e0 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 c6dc98e21f6..92df97e949b 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 26819b2cdba..f0cf51cfc47 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 0bb2325b1f7..48fc619f869 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 cdd95f32a3e..a03bff29068 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 49064eb953e..88fd331781d 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 90f6478f528..6e4a331eca8 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 89aaf463e2e..658a9a4bb79 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 b91aaa9adf7..4c14c556cda 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 ddb407cd1b4..6f1d07de925 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 5f1d58b912b..c3338c2951d 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 9ee16af6a0c..c13450da03d 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 5ac723f784d..31c7bcafbaf 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 223eab90864..a396747714d 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 104aba1d4ba..7bdf6271f5a 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 22a5f479c50..b29495aec0b 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 c66820857cd..0ef2b134ea0 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 b6a475de839..23669644df7 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 9ba00009cb5..c733318f14e 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 0915ee4de13..95093c8529c 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 d8ed180e31b..b9d99c314dc 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 248bb28aabf..4ecf4408c38 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 a3dcb443c9e..8a12e35f353 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 ee71dd79173..4c40742f7cd 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 09241676c4f..e3a613d6fe9 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 9da6afecaa2..a309994ecff 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 24e1341b8bf..266fef4e836 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 d895c7e1fbe..b30cf2ec48c 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 5ca94e9ad78..985d8f70e72 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 db9f770ac87..fb1a95838f9 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 26778593313..1532d11f5d9 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 0961f0a510d..455b38cf8cd 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 0c542423901..052f893f5da 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..521ccc3a8c0 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 09c26ebaaf5..dea3f3fe461 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 c7d3741dfb0..4806ae19a39 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 6f244d16abd..a23edc82849 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 85d8f0d0f1d..28b0e1d3237 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 c9b2a6d7437..c52e709316b 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 02c0deba5cc..efb335ec35d 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 e2ec8aa8e2a..f58be5dd2ec 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 7fe632fe5b6..ad03cae953a 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 dbc94314534..9c007304e09 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 9c8d1a30f7c..0bcdffcdca6 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 c86dce30384..db82bb529af 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 d73b5171820..c4e8a20cb61 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 075022a8a93..d52250c9328 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 7436ad4476c..34dd1b361d4 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 800218cc821..f69f7ae9d0e 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 80877091d4e..9ecca831b68 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 d89b6756ec2..115982248ca 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 2fb1f5d4232..5e95ac5ee1c 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 edc1b4589ef..bcb21b0ee4a 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 895a0058951..17ee1a1dcff 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 6902c9169fe..871a1867308 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 18be85ffeed..7106f41e6bf 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 0ff541a84b9..f732410e494 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 683d12cbd64..28994f998c3 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 2ed7ac8e2bc..90acd39cb08 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 3c0d45f6528..e6666b853aa 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 00bfb2a67ca..94d534430f4 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 5dcdb16238e..63c25954b7a 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 2cdc1873448..a8794192002 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 9c1becf8d37..7e7a610a809 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 f16506adc44..dec219e95a8 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 bead98e396b..243ce2f7f79 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 b6a12024599..83e14a6e6b7 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 a229697c3c5..8c83c5dc781 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 1b8c19f2760..b67db8efeb2 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 f1291a5a99d..6ee27055045 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 c0fc5c47a52..cb9826e90df 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 1087bc687b6..0e6ee6112ea 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 ca71c592c84..50cb428dae5 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 c88bf6bebd6..7e73fd0316a 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 6a9fa33be9d..06c0c67a35e 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 998e0290e20..0b89741e361 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 cb2b4195f96..8e5a1ab0111 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 fe4480ef759..9586d804f82 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 068e9a36116..848a19de60a 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 4dbc96011a3..1cac2e56e52 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 400a5f83b27..3faeec1b371 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 76657a7fcba..b27bf547add 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 38a491d6c80..369cd6e39c7 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 1ca8250ab4e..d7786bbf1b6 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 1287f517308..d5694c48d72 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 369485feaae..336290ee1e1 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 316909d1654..94db94289e2 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 9a461ae7420..d7e5a89f281 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 2e88e4eb551..c000bb1d34e 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