diff options
-rw-r--r-- | binutils/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | binutils/testsuite/binutils-all/windres/windres.exp | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 0f0fef4..dfde0e5 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-07-24 H.J. Lu <hjl@gnu.org> + + * binutils-all/windres/windres.exp: Set xfail on none-ix86/pe + targets. + 2001-07-18 DJ Delorie <dj@redhat.com> * config/default.exp (WINDRES): Add. diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp index 3578835..72ee00c 100644 --- a/binutils/testsuite/binutils-all/windres/windres.exp +++ b/binutils/testsuite/binutils-all/windres/windres.exp @@ -23,6 +23,14 @@ if {![istarget "i*86-*-*"]} { return } +if {![istarget "i*86-*-*pe*"] \ + && ![istarget "i*86-*-cygwin*"] \ + && ![istarget "i*86-*-mingw32*"] } { + set target_xfail "yes" +} else { + set target_xfail "no" +} + if {![info exists WINDRES]} then { return } @@ -35,6 +43,7 @@ set wr "$WINDRES --include-dir $srcdir/$subdir" if [file exists "$srcdir/../../winsup/w32api/include"] { set wr "$wr --include-dir $srcdir/../../winsup/w32api/include" + set target_xfail "no" } else { send_log "\nWarning: Assuming windres can find the win32 headers\n\n" } @@ -68,6 +77,10 @@ foreach res $res_list { } } + if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } { + setup_xfail *-* + } + verbose "$wr -I rc -O res $res tmpdir/$broot.res" 1 catch "exec $wr -I rc -O res $res tmpdir/$broot.res" err @@ -98,6 +111,10 @@ foreach res $res_list { continue; } + if { "$target_xfail" == "yes" } { + setup_xfail *-* + } + verbose "$OBJDUMP -b binary -s tmpdir/$broot.res > tmpdir/$broot.dump" 1 catch "exec $OBJDUMP -b binary -s tmpdir/$broot.res > tmpdir/$broot.dump" err |