projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
4189c55
..
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, 2003, 2004 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
# 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,
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@
-19,18
+19,10
@@
# Written by DJ Delorie <dj@redhat.com>
# Written by DJ Delorie <dj@redhat.com>
-if {![istarget "i*86-*-*"]} {
+if {![istarget "i*86-*-*"]
&& ![istarget "x86_64-*-mingw*"]
} {
return
}
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
}
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"
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"
}
} else {
send_log "\nWarning: Assuming windres can find the win32 headers\n\n"
}
@@
-77,17
+68,17
@@
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
if ![string match "" $err] then {
send_log "$err\n"
verbose "$err" 1
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)"
+ if [string match "*windows.h: No such file*" $err] then {
+ unsupported "windres/$broot (parse)"
+ } else {
+ fail "windres/$broot (parse)"
+ }
continue
}
pass "windres/$broot (parse)"
continue
}
pass "windres/$broot (parse)"
@@
-111,10
+102,6
@@
foreach res $res_list {
continue
}
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
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