Commit e7d842f6 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 279471
parent afe20942
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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) {