update copyright dates

[external/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 72ee00c..5b0c4af 100644 (file)
--- a/binutils/testsuite/binutils-all/windres/windres.exp
+++ b/binutils/testsuite/binutils-all/windres/windres.exp
@@ -1,8 +1,8 @@
-# Copyright 2001 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -12,25 +12,17 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
 
 # Written by DJ Delorie <dj@redhat.com>
 
-if {![istarget "i*86-*-*"]} {
+if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] } {
     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
 }
@@ -43,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"
 }
@@ -73,22 +64,22 @@ foreach res $res_list {
        }
        if [regexp "\[xp\]fail *(\[^ \]*)" $line junk sys] {
            setup_xfail $sys
-           continue;
+           continue
        }
     }
 
-    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
+    verbose "$wr -J rc -O res $res tmpdir/$broot.res" 1
+    catch "exec $wr -J rc -O res $res tmpdir/$broot.res" err
 
     if ![string match "" $err] then {
        send_log "$err\n"
        verbose "$err" 1
-       fail "windres/$broot (parse)"
-       continue;
+       if [string match "*windows.h: No such file*" $err] then {
+           unsupported "windres/$broot (parse)"
+       } else {
+           fail "windres/$broot (parse)"
+       }
+       continue
     }
     pass "windres/$broot (parse)"
 
@@ -100,19 +91,15 @@ foreach res $res_list {
        if [regexp "parse-only" $line] {
            file delete "tmpdir/$broot.res"
            set done 1
-           break;
+           break
        }
        if [regexp "\[xc\]fail *(\[^ \]*)" $line junk sys] {
            setup_xfail $sys
-           continue;
+           continue
        }
     }
     if { $done != 0 } {
-       continue;
-    }
-
-    if { "$target_xfail" == "yes" } {
-       setup_xfail *-*
+       continue
     }
 
     verbose "$OBJDUMP -b binary -s tmpdir/$broot.res > tmpdir/$broot.dump" 1
@@ -122,7 +109,7 @@ foreach res $res_list {
        send_log "$err\n"
        verbose "$err" 1
        fail "windres/$broot (compare)"
-       continue;
+       continue
     }
 
     set pat [open "$sroot.rsd"]
@@ -134,11 +121,11 @@ foreach res $res_list {
        set outline [oneline $out]
 
        if ![string match $patline $outline] {
-           send_log "< $patline\n";
-           send_log "> $outline\n";
-           fail "windres/$broot (compare)";
+           send_log "< $patline\n"
+           send_log "> $outline\n"
+           fail "windres/$broot (compare)"
            set done 1
-           break;
+           break
        }
     }
     if { $done == 0 } {