diff options
Diffstat (limited to 'gas/testsuite')
| -rw-r--r-- | gas/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/testsuite/lib/gas-defs.exp | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 963ed8f0cc..17374f5846 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-11-27 Roland McGrath <mcgrathr@google.com> + + * lib/gas-defs.exp (run_dump_test): If as options include + --compress-debug-sections and zlib is not available, report + the test as unsupported. + 2012-11-23 Alan Modra <amodra@gmail.com> * gas/ppc/astest2.d: Pass -Mppc to objdump. diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp index 234789ac5c..cb81c18fb4 100644 --- a/gas/testsuite/lib/gas-defs.exp +++ b/gas/testsuite/lib/gas-defs.exp @@ -1,5 +1,5 @@ # Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2004, 2005, 2007, 2008, 2009, 2010, 2012 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 @@ -71,7 +71,7 @@ proc gas_host_run { cmd redir } { set return_contents_of "gas.stderr" } elseif [regexp ">&.*" $redir] then { # See PR 5322 for why the following line is used. - regsub ">&" $redir "" output_file + regsub ">&" $redir "" output_file set command "$cmd 2>&1" } elseif [regexp "2>.*" $redir] then { set output_file "gas.out" @@ -582,7 +582,7 @@ proc run_dump_test { name {extra_options {}} } { if { $opts(not-skip) != "" } then { set skip 1 foreach glob $opts(not-skip) { - if {[istarget $glob]} { + if {[istarget $glob]} { set skip 0 break } @@ -597,25 +597,31 @@ proc run_dump_test { name {extra_options {}} } { } set skip 1 foreach glob $opts(target) { - if {[istarget $glob]} { + if {[istarget $glob]} { set skip 0 break } } - if {$skip} { + if {$skip} { unsupported $testname - return + return } } if { $opts(not-target) != "" } then { foreach glob $opts(not-target) { if {[istarget $glob]} { unsupported $testname - return + return } } } + if { [string match "*--compress-debug-sections*" $opts(as)] \ + && ![is_zlib_supported] } { + unsupported $testname + return + } + if { $opts(source) == "" } { set sourcefile ${file}.s |
