Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.arch / amd64-stap-special-operands.exp

diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
index a6ce7f56dca52274c8251378fb62acf71ede7af5..6e6b49b3116863c70a4c216331857e780d8b7d6d 100644 (file)
--- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
@@ -1,4 +1,4 @@
-# Copyright 2013 Free Software Foundation, Inc.
+# Copyright 2013-2016 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { ![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"] } {
+if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } {
     verbose "Skipping amd64-stap-special-operands.exp"
     return
 }
@@ -30,8 +30,7 @@ proc test_probe { probe_name } {
 
 standard_testfile amd64-stap-triplet.S
 
-if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
-    untested amd64-stap-special-operands.exp
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
     return -1
 }
 
@@ -39,8 +38,7 @@ test_probe "triplet"
 
 standard_testfile amd64-stap-three-arg-disp.S
 
-if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
-    untested amd64-stap-special-operands.exp
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
     return -1
 }