diff options
| author | Pierre Gousseau <pierregousseau14@gmail.com> | 2017-05-02 10:22:05 +0000 |
|---|---|---|
| committer | Pierre Gousseau <pierregousseau14@gmail.com> | 2017-05-02 10:22:05 +0000 |
| commit | a09710f1e54c089241210527d2814f588d73b0be (patch) | |
| tree | 1bad5ed17df1e3548401a506020f30f51a86079f /lib/msan/tests/msan_test.cc | |
| parent | 25469d9bd4174709ad3c4b85dadfa7892ebf3171 (diff) | |
Revert r301904 causing tsan test failure in x86_64-linux-autoconf
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@301909 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan/tests/msan_test.cc')
| -rw-r--r-- | lib/msan/tests/msan_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index 432d92c2e..dd81c4d79 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -1581,8 +1581,7 @@ TEST(MemorySanitizer, strdup) { TEST(MemorySanitizer, strndup) { char buf[4] = "abc"; __msan_poison(buf + 2, sizeof(*buf)); - char *x; - EXPECT_UMR(x = strndup(buf, 3)); + char *x = strndup(buf, 3); EXPECT_NOT_POISONED(x[0]); EXPECT_NOT_POISONED(x[1]); EXPECT_POISONED(x[2]); @@ -1594,8 +1593,7 @@ TEST(MemorySanitizer, strndup_short) { char buf[4] = "abc"; __msan_poison(buf + 1, sizeof(*buf)); __msan_poison(buf + 2, sizeof(*buf)); - char *x; - EXPECT_UMR(x = strndup(buf, 2)); + char *x = strndup(buf, 2); EXPECT_NOT_POISONED(x[0]); EXPECT_POISONED(x[1]); EXPECT_NOT_POISONED(x[2]); |