[llvm-branch-commits] [compiler-rt-branch] r242563 - Merging r242449:

[Hans Wennborg]

Author: hans
Date: Fri Jul 17 14:53:58 2015
New Revision: 242563

URL: http://llvm.org/viewvc/llvm-project?rev=242563&view=rev
Log:
Merging r242449:
------------------------------------------------------------------------
r242449 | samsonov | 2015-07-16 14:46:58 -0700 (Thu, 16 Jul 2015) | 1 line

[ASan] PR24150: restrict test case to i386.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/test/asan/TestCases/Linux/kernel-area.cc

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 14:53:58 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350,242424,242444
+/compiler-rt/trunk:242350,242424,242444,242449

Modified: compiler-rt/branches/release_37/test/asan/TestCases/Linux/kernel-area.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/test/asan/TestCases/Linux/kernel-area.cc?rev=242563&r1=242562&r2=242563&view=diff
==============================================================================
--- compiler-rt/branches/release_37/test/asan/TestCases/Linux/kernel-area.cc (original)
+++ compiler-rt/branches/release_37/test/asan/TestCases/Linux/kernel-area.cc Fri Jul 17 14:53:58 2015
@@ -16,7 +16,7 @@
 // CHECK-kernel-64-bits: || `[0x28{{0+}}, 0x3{{f+}}]` || HighShadow ||
 // CHECK-kernel-64-bits: || `[0x24{{0+}}, 0x27{{f+}}]` || ShadowGap  ||
 //
-// REQUIRES: asan-32-bits
+// REQUIRES: asan-32-bits,i386-supported-target
 
 int main() {
   return 0;