From: Indu Bhagat <indu.bhagat@oracle.com>
To: binutils@sourceware.org
Cc: Indu Bhagat <indu.bhagat@oracle.com>
Subject: [PATCH, V2] gas: scfi: fix failing test on Solaris2
Date: Wed, 7 Feb 2024 23:10:30 -0800 [thread overview]
Message-ID: <20240208071030.3712545-1-indu.bhagat@oracle.com> (raw)
[Change from V1]
- Include a check for --32 as well.
[End of changes from V1]
It has been observed that the run of scfi-unsupported-1 test with --x32
arg on a Solaris2 x86_64 system fails:
Executing on host: sh -c {../as-new --x32 --scfi=experimental <...>/scfi-unsupported-1.s 2>&1} /dev/null dump.out (timeout = 300)
spawn [open ...]
Assembler messages:
Fatal error: no compiled in support for 32bit x86_64
regexp_diff match failure
regexp "^Fatal error: SCFI is not supported for this ABI$"
line "Fatal error: no compiled in support for 32bit x86_64"
FAIL: x86_64 scfi-unsupported-1
Fix the above by adding a check for --x32 support before running the
test. While at it, also include a similar check for --32 support.
gas/testsuite/
* gas/scfi/x86_64/scfi-x86-64.exp: Add gas_x32_check and
gas_32_check. Conditionalize the execution of affected
testcases.
---
gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp | 24 +++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp b/gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp
index 9c76974fefe..5324af386f8 100644
--- a/gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp
+++ b/gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp
@@ -14,6 +14,22 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+proc gas_32_check { } {
+ global NM
+ global NMFLAGS
+
+ set status [gas_host_run "$NM $NMFLAGS --help" ""]
+ return [regexp "targets:.*i386" [lindex $status 1]];
+}
+
+proc gas_x32_check { } {
+ global NM
+ global NMFLAGS
+
+ set status [gas_host_run "$NM $NMFLAGS --help" ""]
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
+}
+
if { ![is_elf_format] } then {
return
}
@@ -40,8 +56,12 @@ if { ([istarget "x86_64-*-*"] && ![istarget "x86_64-*-linux*-gnux32"]) } then {
run_list_test "scfi-fp-diag-2" "--scfi=experimental"
run_list_test "scfi-diag-2" "--scfi=experimental"
- run_list_test "scfi-unsupported-1" "--32 --scfi=experimental"
- run_list_test "scfi-unsupported-1" "--x32 --scfi=experimental"
+ if { [gas_32_check] } then {
+ run_list_test "scfi-unsupported-1" "--32 --scfi=experimental"
+ }
+ if { [gas_x32_check] } then {
+ run_list_test "scfi-unsupported-1" "--x32 --scfi=experimental"
+ }
run_list_test "scfi-unsupported-insn-1" "--scfi=experimental"
run_list_test "scfi-unsupported-2" "--scfi=experimental"
run_list_test "scfi-unsupported-3" "--scfi=experimental"
--
2.43.0
next reply other threads:[~2024-02-08 7:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-08 7:10 Indu Bhagat [this message]
2024-02-08 8:09 ` Jan Beulich
2024-02-09 7:25 ` Indu Bhagat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240208071030.3712545-1-indu.bhagat@oracle.com \
--to=indu.bhagat@oracle.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).