[llvm-branch-commits] [llvm-branch] r293575 - Merging r293021:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Jan 30 18:39:51 2017
New Revision: 293575

URL: http://llvm.org/viewvc/llvm-project?rev=293575&view=rev
Log:
Merging r293021:
------------------------------------------------------------------------
r293021 | chapuni | 2017-01-24 21:26:23 -0800 (Tue, 24 Jan 2017) | 4 lines

Ignore llvm/test/tools/llvm-symbolizer/coff-exports.test on mingw.

FIXME: Demangler could behave along not host but target.
For example, assume host=mingw, target=msc.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/test/tools/llvm-symbolizer/coff-exports.test

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 18:39:51 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292625,292641,292651,292667,292711-292713,292758,293025,293259,293291,293293
+/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292625,292641,292651,292667,292711-292713,292758,293021,293025,293259,293291,293293

Modified: llvm/branches/release_40/test/tools/llvm-symbolizer/coff-exports.test
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/tools/llvm-symbolizer/coff-exports.test?rev=293575&r1=293574&r2=293575&view=diff
==============================================================================
--- llvm/branches/release_40/test/tools/llvm-symbolizer/coff-exports.test (original)
+++ llvm/branches/release_40/test/tools/llvm-symbolizer/coff-exports.test Mon Jan 30 18:39:51 2017
@@ -2,8 +2,10 @@ RUN: grep '^ADDR:' %s | sed -s 's/ADDR:
 RUN: 	 | llvm-symbolizer --inlining --relative-address -obj="%p/Inputs/coff-exports.exe" \
 RUN:	 | FileCheck %s
 
-This test relies on UnDecorateSymbolName, which is Windows-only.
+This test relies on UnDecorateSymbolName, which is Win32-only.
 REQUIRES: system-windows
+REQUIRES: target-windows
+FIXME: This test depends on host, not target.
 
 ADDR: 0x500A
 ADDR: 0x5038