summaryrefslogtreecommitdiff
path: root/lib/msan/tests
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2017-05-18 09:31:37 +0000
committerDaniel Jasper <djasper@google.com>2017-05-18 09:31:37 +0000
commit17219d802f003f2e21fd5432d7cd19501b61acad (patch)
treee9e4f8dd67c05c067c0bd62fe821d1cebea61be7 /lib/msan/tests
parentdb37b96cbef5ca2abec3bd3f9956c29ff64dd37f (diff)
Revert r302781 and subsequent attempts to disable part of it.
The Msan unit tests are still broken and by this point, I think we should start over. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@303339 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan/tests')
-rw-r--r--lib/msan/tests/msan_test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc
index 58f695e69..c7c91324a 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]);