From 9ace5d9690357c50862f5e351b6309e2d8807428 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 24 Aug 2012 17:42:56 +0000 Subject: [PATCH] Skip x32 tests for Solaris * gas/i386/ilp32/ilp32.exp: Skip Solaris. * gas/i386/ilp32/cfi/ilp32.exp: Likewise. * gas/i386/ilp32/elf/ilp32.exp: Likewise. * gas/i386/ilp32/lns/ilp32.exp: Likewise. --- gas/testsuite/ChangeLog | 7 +++++++ gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp | 4 ++++ gas/testsuite/gas/i386/ilp32/elf/ilp32.exp | 4 ++++ gas/testsuite/gas/i386/ilp32/ilp32.exp | 2 +- gas/testsuite/gas/i386/ilp32/lns/ilp32.exp | 4 ++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 129e62f82e3..735e0b4eac9 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-08-24 H.J. Lu + + * gas/i386/ilp32/ilp32.exp: Skip Solaris. + * gas/i386/ilp32/cfi/ilp32.exp: Likewise. + * gas/i386/ilp32/elf/ilp32.exp: Likewise. + * gas/i386/ilp32/lns/ilp32.exp: Likewise. + 2012-08-24 Matthew Gretton-Dann * gas/arm/armv8-a+crypto.s: Update testcase. diff --git a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp index 9593720accf..3a6dbd5253a 100644 --- a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp +++ b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp @@ -9,6 +9,10 @@ proc gas_64_check { } { return [regexp "targets:.*x86-64" [lindex $status 1]]; } +if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then { + return +} + if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then { global ASFLAGS diff --git a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp index 9593720accf..3a6dbd5253a 100644 --- a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp +++ b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp @@ -9,6 +9,10 @@ proc gas_64_check { } { return [regexp "targets:.*x86-64" [lindex $status 1]]; } +if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then { + return +} + if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then { global ASFLAGS diff --git a/gas/testsuite/gas/i386/ilp32/ilp32.exp b/gas/testsuite/gas/i386/ilp32/ilp32.exp index de43bf25ed7..51970222c0c 100644 --- a/gas/testsuite/gas/i386/ilp32/ilp32.exp +++ b/gas/testsuite/gas/i386/ilp32/ilp32.exp @@ -9,7 +9,7 @@ proc gas_64_check { } { return [regexp "targets:.*x86-64" [lindex $status 1]]; } -if [istarget "x86_64-*-solaris*"] then { +if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then { return } diff --git a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp index 9593720accf..3a6dbd5253a 100644 --- a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp +++ b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp @@ -9,6 +9,10 @@ proc gas_64_check { } { return [regexp "targets:.*x86-64" [lindex $status 1]]; } +if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then { + return +} + if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then { global ASFLAGS -- 2.30.2