[RFC,3/3,gdb/testsuite] Add and use is_x86_64_m64_target
Commit Message
Add new proc is_x86_64_m64_target and use it by running:
...
$ ./gdb/contrib/refactor.py refactor_require
...
---
gdb/testsuite/gdb.arch/amd64-entry-value-param.exp | 5 ++---
gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp | 5 ++---
gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp | 5 ++---
gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp | 5 +----
gdb/testsuite/gdb.python/py-linetable.exp | 5 ++---
gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp | 5 ++---
gdb/testsuite/gdb.reverse/singlejmp-reverse.exp | 5 ++---
gdb/testsuite/lib/gdb.exp | 4 ++++
8 files changed, 17 insertions(+), 22 deletions(-)
Comments
>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
Tom> Add new proc is_x86_64_m64_target and use it by running:
Tom> +proc is_x86_64_m64_target {} {
Probably should have an intro comment... it's kind of pedantic though
since IMO the name is pretty clear.
Tom> + return [istarget x86_64-*-* ] && [is_lp64_target]
Should wrap this in [expr {...}], since otherwise calling this will
return a string like "1 && 0" or something. Maybe we have a double-eval
somewhere if this is actually working.
Tom
@@ -20,9 +20,8 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.arch/amd64-entry-value-param.exp COMPILE=1"
set srcfile ${srcfile2}
lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping amd64-entry-value-param."
- return
+} else {
+ require is_x86_64_m64_target
}
if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
@@ -20,9 +20,8 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.arch/amd64-tailcall-ret.exp COMPILE=1"
standard_testfile
lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping ${testfile}."
- return
+} else {
+ require is_x86_64_m64_target
}
if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
@@ -28,9 +28,8 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.mi/mi2-amd64-entry-value.exp COMPILE=1"
set srcfile ${testfile}.c
lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping mi2-amd64-entry-value."
- return
+} else {
+ require is_x86_64_m64_target
}
set executable ${testfile}
@@ -19,10 +19,7 @@ require allow_python_tests
standard_testfile amd64-py-framefilter-invalidarg.S
-if { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping py-framefilter-invalidarg."
- return
-}
+require is_x86_64_m64_target
# We cannot use prepare_for_testing as we have to set the safe-patch
# to check objfile and progspace printers.
@@ -22,9 +22,8 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.python/py-linetable.exp COMPILE=1"
standard_testfile
lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping ${testfile}."
- return
+} else {
+ require is_x86_64_m64_target
}
if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
@@ -22,9 +22,8 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.reverse/amd64-tailcall-reverse.exp COMPILE=1"
standard_testfile
lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping ${testfile}."
- return
+} else {
+ require is_x86_64_m64_target
}
if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
@@ -26,9 +26,8 @@ if [info exists COMPILE] {
] == -1 } {
return -1
}
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping ${testfile}."
- return
+} else {
+ require is_x86_64_m64_target
} elseif { [build_executable ${testfile}.exp ${testfile} \
[list ${srcfile} ${srcfile2}] {}] == -1 } {
return -1
@@ -3414,6 +3414,10 @@ proc is_x86_like_target {} {
return [expr [is_ilp32_target] && ![is_amd64_regs_target]]
}
+proc is_x86_64_m64_target {} {
+ return [istarget x86_64-*-* ] && [is_lp64_target]
+}
+
# Return 1 if this target is an arm or aarch32 on aarch64.
gdb_caching_proc is_aarch32_target {