diff options
| author | Hans Wennborg <hans@hanshq.net> | 2016-08-22 20:44:16 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2016-08-22 20:44:16 +0000 |
| commit | 38631afc1dec4d5b13b6460e808b5dae6c009081 (patch) | |
| tree | 225f671cbba574d1674678b4628efade3011c6cb | |
| parent | 96f4e6709e2a5192576b0467fe3d7ce6dc646b38 (diff) | |
| download | compiler-rt-38631afc1dec4d5b13b6460e808b5dae6c009081.tar.gz | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_39@279471 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/msan/tests/msan_test.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index e4076b5bd..9ec1e2837 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -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) { |