[llvm-branch-commits] [llvm-branch] r242527 - Merging r242236:

[Hans Wennborg]

Author: hans
Date: Fri Jul 17 10:41:11 2015
New Revision: 242527

URL: http://llvm.org/viewvc/llvm-project?rev=242527&view=rev
Log:
Merging r242236:
------------------------------------------------------------------------
r242236 | rafael | 2015-07-14 15:42:21 -0700 (Tue, 14 Jul 2015) | 1 line

Accept lower case to handle windows error messages.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/test/Object/archive-extract.test

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 10:41:11 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242239,242288,242331,242341,242410,242412,242442
+/llvm/trunk:155241,242236,242239,242288,242331,242341,242410,242412,242442

Modified: llvm/branches/release_37/test/Object/archive-extract.test
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/test/Object/archive-extract.test?rev=242527&r1=242526&r2=242527&view=diff
==============================================================================
--- llvm/branches/release_37/test/Object/archive-extract.test (original)
+++ llvm/branches/release_37/test/Object/archive-extract.test Fri Jul 17 10:41:11 2015
@@ -53,4 +53,4 @@ RUN: llvm-ar p %p/Inputs/thin.a evenlen
 EVENLEN: evenlen
 
 RUN: not llvm-ar p %p/Inputs/thin-path.a t/test2.o | FileCheck %s --check-prefix=MISSING
-MISSING: No such file or directory.
+MISSING: {{N|n}}o such file or directory.