[llvm-branch-commits] [compiler-rt-branch] r311736 - Merging r311674:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 24 17:31:02 2017
New Revision: 311736

URL: http://llvm.org/viewvc/llvm-project?rev=311736&view=rev
Log:
Merging r311674:
------------------------------------------------------------------------
r311674 | hans | 2017-08-24 10:00:36 -0700 (Thu, 24 Aug 2017) | 3 lines

Mark allocator_oom_test.cc unsupported on arm & aarch64 (PR33972)

The buildbots don't seem to like it.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_50/   (props changed)
    compiler-rt/branches/release_50/test/asan/TestCases/Linux/allocator_oom_test.cc

Propchange: compiler-rt/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 24 17:31:02 2017
@@ -1 +1 @@
-/compiler-rt/trunk:311495-311496,311555
+/compiler-rt/trunk:311495-311496,311555,311674

Modified: compiler-rt/branches/release_50/test/asan/TestCases/Linux/allocator_oom_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_50/test/asan/TestCases/Linux/allocator_oom_test.cc?rev=311736&r1=311735&r2=311736&view=diff
==============================================================================
--- compiler-rt/branches/release_50/test/asan/TestCases/Linux/allocator_oom_test.cc (original)
+++ compiler-rt/branches/release_50/test/asan/TestCases/Linux/allocator_oom_test.cc Thu Aug 24 17:31:02 2017
@@ -29,8 +29,9 @@
 // RUN:   | FileCheck %s --check-prefixes=CHECK-MALLOC-REALLOC,CHECK-NULL
 
 // ASan shadow memory on s390 is too large for this test.
+// AArch64 bots fail on this test.
 // TODO(alekseys): Android lit do not run ulimit on device.
-// UNSUPPORTED: s390,android
+// UNSUPPORTED: s390,android,arm,aarch64
 
 #include <stdlib.h>
 #include <string.h>