[llvm-branch-commits] [compiler-rt-branch] r279471 - Merging r279352:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug 22 15:44:16 2016
New Revision: 279471

URL: http://llvm.org/viewvc/llvm-project?rev=279471&view=rev
Log:
Merging r279352:
------------------------------------------------------------------------
r279352 | eugenis | 2016-08-19 17:38:55 -0700 (Fri, 19 Aug 2016) | 1 line

[msan] Disable prlimit test on glibc < 2.13.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_39/   (props changed)
    compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc

Propchange: compiler-rt/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 15:44:16 2016
@@ -1 +1 @@
-/compiler-rt/trunk:275946,275948,276015,277297,277300,278454
+/compiler-rt/trunk:275946,275948,276015,277297,277300,278454,279352

Modified: compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc?rev=279471&r1=279470&r2=279471&view=diff
==============================================================================
--- compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc (original)
+++ compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc Mon Aug 22 15:44:16 2016
@@ -2825,6 +2825,12 @@ TEST(MemorySanitizer, LongStruct) {
   EXPECT_POISONED(s2.a8);
 }
 
+#ifdef __GLIBC__
+#define MSAN_TEST_PRLIMIT __GLIBC_PREREQ(2, 13)
+#else
+#define MSAN_TEST_PRLIMIT 1
+#endif
+
 TEST(MemorySanitizer, getrlimit) {
   struct rlimit limit;
   __msan_poison(&limit, sizeof(limit));
@@ -2833,6 +2839,7 @@ TEST(MemorySanitizer, getrlimit) {
   EXPECT_NOT_POISONED(limit.rlim_cur);
   EXPECT_NOT_POISONED(limit.rlim_max);
 
+#if MSAN_TEST_PRLIMIT
   struct rlimit limit2;
   __msan_poison(&limit2, sizeof(limit2));
   result = prlimit(getpid(), RLIMIT_DATA, &limit, &limit2);
@@ -2848,6 +2855,7 @@ TEST(MemorySanitizer, getrlimit) {
 
   result = prlimit(getpid(), RLIMIT_DATA, &limit, nullptr);
   ASSERT_EQ(result, 0);
+#endif
 }
 
 TEST(MemorySanitizer, getrusage) {