diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 065b1c3f5d5..eb7fe0b6160 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2018-03-23 Andrew Burgess + + * gdb.arch/amd64-disp-step-avx.exp: Remove unneeded assembler flag + option, syntax was wrong anyway. + * gdb.arch/arm-disp-step.exp: Likewise. + * gdb.arch/sparc64-regs.exp: Likewise. + * gdb.arch/amd64-disp-step.exp: Remove unneeded assembler flag + option, syntax was wrong anyway, switch to use + prepare_for_testing. + * gdb.arch/i386-disp-step.exp: Likewise. + 2018-03-23 Andreas Arnez * gdb.ada/exec_changed.exp: Replace "target_info exists diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp index 5c20aeb35b4..1f85fa77c1a 100644 --- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp +++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp @@ -25,10 +25,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { standard_testfile .S -set additional_flags "-Wa,-g" - -if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ - [list debug $additional_flags]] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp index 84f7e69e40e..782b75896cc 100644 --- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp +++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp @@ -27,20 +27,10 @@ set newline "\[\r\n\]*" standard_testfile .S -set additional_flags "-Wa,-g" - -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested "failed to compile" +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -# Get things started. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - gdb_test "set displaced-stepping on" "" gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*" diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp index 760d392885e..0f33b37eaf1 100644 --- a/gdb/testsuite/gdb.arch/arm-disp-step.exp +++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp @@ -24,9 +24,7 @@ if {![is_aarch32_target]} then { standard_testfile .S -set additional_flags "-Wa,-g" - -if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug $additional_flags]] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp index ff0713cef96..d15c54be74b 100644 --- a/gdb/testsuite/gdb.arch/i386-disp-step.exp +++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp @@ -25,20 +25,10 @@ if { ![is_x86_like_target] } then { standard_testfile .S -set additional_flags "-Wa,-g" - -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested "failed to compile" +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -# Get things started. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - gdb_test "set displaced-stepping on" "" gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*" diff --git a/gdb/testsuite/gdb.arch/sparc64-regs.exp b/gdb/testsuite/gdb.arch/sparc64-regs.exp index 3e84de6dd01..6b621bbd98c 100644 --- a/gdb/testsuite/gdb.arch/sparc64-regs.exp +++ b/gdb/testsuite/gdb.arch/sparc64-regs.exp @@ -25,10 +25,7 @@ if ![istarget "sparc64*-*-linux*"] then { standard_testfile .S -set additional_flags "-Wa,-g" - -if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ - [list debug $additional_flags]] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 }