Merge commit 'upstream/2.20'

[msp430-binutils.git] / binutils / testsuite / binutils-all / windres / windres.exp

diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
index 9c2f4773b9bd682df05b59c7a965b6f934295b38..5b0c4afc8990ef8fe1b89633bbd2e62022c3e872 100644 (file)
--- a/binutils/testsuite/binutils-all/windres/windres.exp
+++ b/binutils/testsuite/binutils-all/windres/windres.exp
@@ -1,4 +1,4 @@
-# Copyright 2001, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2001, 2003, 2004, 2006, 2007, 2009 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
@@ -23,15 +23,6 @@ if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] } {
     return
 }
 
-if {![istarget "i*86-*-*pe*"] \
-    && ![istarget "i*86-*-cygwin*"] \
-    && ![istarget "i*86-*-mingw32*"] \
-    && ![istarget "x86_64-*-mingw*"] } {
-    set target_xfail "yes"
-} else {
-    set target_xfail "no"
-}
-
 if {![info exists WINDRES]} then {
     return
 }
@@ -44,7 +35,6 @@ 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"
 }
@@ -78,10 +68,6 @@ foreach res $res_list {
        }
     }
 
-    if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } {
-       setup_xfail *-*
-    }
-
     verbose "$wr -J rc -O res $res tmpdir/$broot.res" 1
     catch "exec $wr -J rc -O res $res tmpdir/$broot.res" err
 
@@ -116,10 +102,6 @@ foreach res $res_list {
        continue
     }
 
-    if { "$broot" != "bmpalign" && "$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