diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-11-25 15:00:23 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-11-25 15:00:23 +0000 |
commit | e460861f7ce10fbff7fd24c714375f834aee0ac2 (patch) | |
tree | 4d1fb49b7f334a7a3dbab10a87a461a15bee18bd /lib/msan/tests | |
parent | c4f5305d85017ebed6113228cabb644b18d54409 (diff) |
[msan] Remove leftover MSanDR bits in tests.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@222762 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan/tests')
-rw-r--r-- | lib/msan/tests/CMakeLists.txt | 16 | ||||
-rw-r--r-- | lib/msan/tests/msan_test.cc | 1 | ||||
-rw-r--r-- | lib/msan/tests/msandr_test_so.cc | 38 | ||||
-rw-r--r-- | lib/msan/tests/msandr_test_so.h | 24 |
4 files changed, 1 insertions, 78 deletions
diff --git a/lib/msan/tests/CMakeLists.txt b/lib/msan/tests/CMakeLists.txt index f3c11ba7e..53e1b549b 100644 --- a/lib/msan/tests/CMakeLists.txt +++ b/lib/msan/tests/CMakeLists.txt @@ -15,10 +15,8 @@ set(MSAN_UNITTEST_SOURCES msan_test.cc msan_test_main.cc) set(MSAN_LOADABLE_SOURCE msan_loadable.cc) set(MSAN_UNITTEST_HEADERS msan_test_config.h - msandr_test_so.h ../../../include/sanitizer/msan_interface.h ) -set(MSANDR_UNITTEST_SOURCE msandr_test_so.cc) set(MSAN_UNITTEST_COMMON_CFLAGS -I${COMPILER_RT_LIBCXX_PATH}/include ${COMPILER_RT_GTEST_CFLAGS} @@ -113,25 +111,13 @@ macro(add_msan_tests_for_arch arch kind) msan_compile(MSAN_INST_LOADABLE_OBJECTS ${MSAN_LOADABLE_SOURCE} ${arch} "${kind}" ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN}) - # Uninstrumented shared object for MSanDR tests. - set(MSANDR_TEST_OBJECTS) - msan_compile(MSANDR_TEST_OBJECTS ${MSANDR_UNITTEST_SOURCE} ${arch} "${kind}" - ${MSAN_UNITTEST_COMMON_CFLAGS}) - # Instrumented loadable library tests. set(MSAN_LOADABLE_SO) msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch} "${kind}" OBJECTS ${MSAN_INST_LOADABLE_OBJECTS} DEPS ${MSAN_INST_LOADABLE_OBJECTS}) - # Uninstrumented shared library tests. - set(MSANDR_TEST_SO) - msan_link_shared(MSANDR_TEST_SO "libmsandr_test" ${arch} "${kind}" - OBJECTS ${MSANDR_TEST_OBJECTS} - DEPS ${MSANDR_TEST_OBJECTS}) - - set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST} - ${MSANDR_TEST_SO}) + set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST}) set(MSAN_TEST_DEPS ${MSAN_TEST_OBJECTS} libcxx_msan${kind} ${MSAN_LOADABLE_SO}) if(NOT COMPILER_RT_STANDALONE_BUILD) diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index 84fa9623e..697cfb881 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -20,7 +20,6 @@ #include "sanitizer/allocator_interface.h" #include "sanitizer/msan_interface.h" -#include "msandr_test_so.h" #include <inttypes.h> #include <stdlib.h> diff --git a/lib/msan/tests/msandr_test_so.cc b/lib/msan/tests/msandr_test_so.cc deleted file mode 100644 index eb605d4db..000000000 --- a/lib/msan/tests/msandr_test_so.cc +++ /dev/null @@ -1,38 +0,0 @@ -//===-- msandr_test_so.cc ------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file is a part of MemorySanitizer. -// -// MemorySanitizer unit tests. -//===----------------------------------------------------------------------===// - -#include "msandr_test_so.h" - -void dso_memfill(char* s, unsigned n) { - for (unsigned i = 0; i < n; ++i) - s[i] = i; -} - -int dso_callfn(int (*fn)(void)) { - volatile int x = fn(); - return x; -} - -int dso_callfn1(int (*fn)(long long, long long, long long)) { //NOLINT - volatile int x = fn(1, 2, 3); - return x; -} - -int dso_stack_store(void (*fn)(int*, int*), int x) { - int y = x + 1; - fn(&x, &y); - return y; -} - -void break_optimization(void *x) {} diff --git a/lib/msan/tests/msandr_test_so.h b/lib/msan/tests/msandr_test_so.h deleted file mode 100644 index cd75ff34f..000000000 --- a/lib/msan/tests/msandr_test_so.h +++ /dev/null @@ -1,24 +0,0 @@ -//===-- msandr_test_so.h ----------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file is a part of MemorySanitizer. -// -// MemorySanitizer unit tests. -//===----------------------------------------------------------------------===// - -#ifndef MSANDR_MSANDR_TEST_SO_H -#define MSANDR_MSANDR_TEST_SO_H - -void dso_memfill(char* s, unsigned n); -int dso_callfn(int (*fn)(void)); -int dso_callfn1(int (*fn)(long long, long long, long long)); //NOLINT -int dso_stack_store(void (*fn)(int*, int*), int x); -void break_optimization(void *x); - -#endif |