Move MSan lit-tests under test/msan

llvm-svn: 201412

90 files changed, 82 insertions, 130 deletions

diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 211d9171441..3bbcf0af2bb 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -233,6 +233,7 @@ filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
   x86_64 i386 powerpc64 arm)
 filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64)
 filter_available_targets(LSAN_SUPPORTED_ARCH x86_64)
+filter_available_targets(MSAN_SUPPORTED_ARCH x86_64)
 filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386)
 
 add_subdirectory(include)
@@ -248,6 +249,13 @@ if (NOT ANDROID)
   endif()
 endif()
 
+set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)
+if(EXISTS ${COMPILER_RT_LIBCXX_PATH}/)
+  set(COMPILER_RT_HAS_LIBCXX_SOURCES TRUE)
+else()
+  set(COMPILER_RT_HAS_LIBCXX_SOURCES FALSE)
+endif()
+
 add_subdirectory(lib)
 
 if(LLVM_INCLUDE_TESTS)
diff --git a/compiler-rt/lib/msan/CMakeLists.txt b/compiler-rt/lib/msan/CMakeLists.txt
index 06f3f65d8e3..d876a73b36f 100644
--- a/compiler-rt/lib/msan/CMakeLists.txt
+++ b/compiler-rt/lib/msan/CMakeLists.txt
@@ -17,7 +17,7 @@ set(MSAN_RTL_CFLAGS
   -ffreestanding)
 
 # Static runtime library.
-set(MSAN_RUNTIME_LIBRARIES)
+add_custom_target(msan)
 set(arch "x86_64")
 if(CAN_TARGET_${arch})
   add_compiler_rt_static_runtime(clang_rt.msan-${arch} ${arch}
@@ -26,25 +26,16 @@ if(CAN_TARGET_${arch})
             $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
     CFLAGS ${MSAN_RTL_CFLAGS})
-  list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch})
+  add_dependencies(msan clang_rt.msan-${arch})
   if(UNIX)
     add_sanitizer_rt_symbols(clang_rt.msan-${arch} msan.syms.extra)
-    list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}-symbols)
+    add_dependencies(msan clang_rt.msan-${arch}-symbols)
   endif()
 endif()
 
 add_compiler_rt_resource_file(msan_blacklist msan_blacklist.txt)
-
-# We should only build MSan unit tests if we can build instrumented libcxx.
-set(MSAN_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)
-if(EXISTS ${MSAN_LIBCXX_PATH}/)
-  set(MSAN_CAN_INSTRUMENT_LIBCXX TRUE)
-else()
-  set(MSAN_CAN_INSTRUMENT_LIBCXX FALSE)
-endif()
+add_dependencies(msan msan_blacklist)
 
 if(LLVM_INCLUDE_TESTS)
   add_subdirectory(tests)
 endif()
-
-add_subdirectory(lit_tests)
diff --git a/compiler-rt/lib/msan/lit_tests/CMakeLists.txt b/compiler-rt/lib/msan/lit_tests/CMakeLists.txt
deleted file mode 100644
index 38d1e59e709..00000000000
--- a/compiler-rt/lib/msan/lit_tests/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(MSAN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
-set(MSAN_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/..)
-
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
-
-if(MSAN_CAN_INSTRUMENT_LIBCXX)
-  configure_lit_site_cfg(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
-    ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
-endif()
-
-if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64)
-  # Run MSan tests only if we're sure we may produce working binaries.
-  set(MSAN_TEST_DEPS
-    ${SANITIZER_COMMON_LIT_TEST_DEPS}
-    ${MSAN_RUNTIME_LIBRARIES}
-    msan_blacklist)
-  set(MSAN_TEST_PARAMS
-    msan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
-  if(LLVM_INCLUDE_TESTS AND MSAN_CAN_INSTRUMENT_LIBCXX)
-    list(APPEND MSAN_TEST_DEPS MsanUnitTests)
-  endif()
-  add_lit_testsuite(check-msan "Running the MemorySanitizer tests"
-    ${CMAKE_CURRENT_BINARY_DIR}
-    PARAMS ${MSAN_TEST_PARAMS}
-    DEPENDS ${MSAN_TEST_DEPS}
-    )
-  set_target_properties(check-msan PROPERTIES FOLDER "MSan tests")
-endif()
diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg
deleted file mode 100644
index da1bde6dd04..00000000000
--- a/compiler-rt/lib/msan/lit_tests/lit.cfg
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- Python -*-
-
-import os
-
-import lit.util
-
-def get_required_attr(config, attr_name):
-  attr_value = getattr(config, attr_name, None)
-  if not attr_value:
-    lit_config.fatal(
-      "No attribute %r in test configuration! You may need to run "
-      "tests from your build directory or add this attribute "
-      "to lit.site.cfg " % attr_name)
-  return attr_value
-
-# Setup config name.
-config.name = 'MemorySanitizer'
-
-# Setup source root.
-config.test_source_root = os.path.dirname(__file__)
-
-def DisplayNoConfigMessage():
-  lit_config.fatal("No site specific configuration available! " +
-                   "Try running your test from the build tree or running " +
-                   "make check-msan")
-
-# Figure out LLVM source root.
-llvm_src_root = getattr(config, 'llvm_src_root', None)
-if llvm_src_root is None:
-  # We probably haven't loaded the site-specific configuration: the user
-  # is likely trying to run a test file directly, and the site configuration
-  # wasn't created by the build system.
-  msan_site_cfg = lit_config.params.get('msan_site_config', None)
-  if (msan_site_cfg) and (os.path.exists(msan_site_cfg)):
-    lit_config.load_config(config, msan_site_cfg)
-    raise SystemExit
-
-  # Try to guess the location of site-specific configuration using llvm-config
-  # util that can point where the build tree is.
-  llvm_config = lit.util.which("llvm-config", config.environment["PATH"])
-  if not llvm_config:
-    DisplayNoConfigMessage()
-
-  # Find out the presumed location of generated site config.
-  llvm_obj_root = lit.util.capture(["llvm-config", "--obj-root"]).strip()
-  msan_site_cfg = os.path.join(llvm_obj_root, "projects", "compiler-rt",
-                               "lib", "msan", "lit_tests", "lit.site.cfg")
-  if (not msan_site_cfg) or (not os.path.exists(msan_site_cfg)):
-    DisplayNoConfigMessage()
-
-  lit_config.load_config(config, msan_site_cfg)
-  raise SystemExit
-
-# Setup default compiler flags used with -fsanitize=memory option.
-clang_msan_cflags = ["-fsanitize=memory",
-                     "-mno-omit-leaf-frame-pointer",
-                     "-fno-omit-frame-pointer",
-                     "-fno-optimize-sibling-calls",
-                     "-g",
-                     "-m64"]
-clang_msan_cxxflags = ["--driver-mode=g++ "] + clang_msan_cflags
-config.substitutions.append( ("%clang_msan ",
-                              " ".join([config.clang] + clang_msan_cflags) + 
-                              " ") )
-config.substitutions.append( ("%clangxx_msan ",
-                              " ".join([config.clang] + clang_msan_cxxflags) + 
-                              " ") )
-
-# Default test suffixes.
-config.suffixes = ['.c', '.cc', '.cpp']
-
-# MemorySanitizer tests are currently supported on Linux only.
-if config.host_os not in ['Linux']:
-  config.unsupported = True
diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt
index 9c49f167fa1..d679524225d 100644
--- a/compiler-rt/lib/msan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -6,9 +6,9 @@ include_directories(..)
 include_directories(../..)
 
 # Instrumented libcxx sources and build flags.
-file(GLOB MSAN_LIBCXX_SOURCES ${MSAN_LIBCXX_PATH}/src/*.cpp)
+file(GLOB MSAN_LIBCXX_SOURCES ${COMPILER_RT_LIBCXX_PATH}/src/*.cpp)
 set(MSAN_LIBCXX_CFLAGS
-  -I${MSAN_LIBCXX_PATH}/include
+  -I${COMPILER_RT_LIBCXX_PATH}/include
   -fsanitize=memory
   -fsanitize-memory-track-origins
   -fPIC
@@ -39,7 +39,7 @@ set(MSAN_UNITTEST_HEADERS
 )
 set(MSANDR_UNITTEST_SOURCE msandr_test_so.cc)
 set(MSAN_UNITTEST_COMMON_CFLAGS
-  -I${MSAN_LIBCXX_PATH}/include
+  -I${COMPILER_RT_LIBCXX_PATH}/include
   ${COMPILER_RT_GTEST_INCLUDE_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/include
   -I${COMPILER_RT_SOURCE_DIR}/lib
@@ -78,7 +78,7 @@ macro(msan_compile obj_list source arch)
   get_target_flags_for_arch(${arch} TARGET_CFLAGS)
   clang_compile(${output_obj} ${source}
                 CFLAGS ${ARGN} ${TARGET_CFLAGS}
-                DEPS gtest ${MSAN_RUNTIME_LIBRARIES} ${MSAN_UNITTEST_HEADERS})
+                DEPS gtest msan ${MSAN_UNITTEST_HEADERS})
   list(APPEND ${obj_list} ${output_obj})
 endmacro()
 
@@ -99,7 +99,7 @@ macro(add_msan_test test_suite test_name arch)
   get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
   add_compiler_rt_test(${test_suite} ${test_name}
                        OBJECTS ${ARGN}
-                       DEPS ${MSAN_RUNTIME_LIBRARIES} ${ARGN}
+                       DEPS msan ${ARGN}
                             ${MSAN_LOADABLE_SO}
                        LINK_FLAGS ${MSAN_UNITTEST_LINK_FLAGS}
                                   ${TARGET_LINK_FLAGS}
@@ -128,7 +128,7 @@ macro(add_msan_tests_for_arch arch)
   msan_link_shared(MSAN_INST_LIBCXX "libcxx" ${arch}
                    OBJECTS ${MSAN_INST_LIBCXX_OBJECTS}
                    LINKFLAGS ${MSAN_LIBCXX_LINK_FLAGS}
-                   DEPS ${MSAN_INST_LIBCXX_OBJECTS} ${MSAN_RUNTIME_LIBRARIES})
+                   DEPS ${MSAN_INST_LIBCXX_OBJECTS} msan)
 
   # Instrumented tests.
   set(MSAN_INST_TEST_OBJECTS)
@@ -151,13 +151,13 @@ macro(add_msan_tests_for_arch arch)
   set(MSAN_LOADABLE_SO)
   msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch}
                    OBJECTS ${MSAN_INST_LOADABLE_OBJECTS}
-                   DEPS ${MSAN_INST_LOADABLE_OBJECTS} ${MSAN_RUNTIME_LIBRARIES})
+                   DEPS ${MSAN_INST_LOADABLE_OBJECTS} msan)
 
   # Uninstrumented shared library tests.
   set(MSANDR_TEST_SO)
   msan_link_shared(MSANDR_TEST_SO "libmsandr_test" ${arch}
                    OBJECTS ${MSANDR_TEST_OBJECTS}
-                   DEPS ${MSANDR_TEST_OBJECTS} ${MSAN_RUNTIME_LIBRARIES})
+                   DEPS ${MSANDR_TEST_OBJECTS} msan)
 
   # Link everything together.
   add_msan_test(MsanUnitTests "Msan-${arch}-Test" ${arch}
@@ -165,7 +165,8 @@ macro(add_msan_tests_for_arch arch)
                 ${MSAN_INST_LIBCXX} ${MSANDR_TEST_SO})
 endmacro()
 
-if(COMPILER_RT_CAN_EXECUTE_TESTS AND MSAN_CAN_INSTRUMENT_LIBCXX)
+# We should only build MSan unit tests if we can build instrumented libcxx.
+if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
   if(CAN_TARGET_x86_64)
     add_msan_tests_for_arch(x86_64)
   endif()
diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
index 6c9b08f6d22..4b8401e6239 100644
--- a/compiler-rt/test/CMakeLists.txt
+++ b/compiler-rt/test/CMakeLists.txt
@@ -15,6 +15,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(LSAN_SUPPORTED_ARCH)
     add_subdirectory(lsan)
   endif()
+  if(MSAN_SUPPORTED_ARCH)
+    add_subdirectory(msan)
+  endif()
   if(UBSAN_SUPPORTED_ARCH)
     add_subdirectory(ubsan)
   endif()
diff --git a/compiler-rt/test/lsan/CMakeLists.txt b/compiler-rt/test/lsan/CMakeLists.txt
index 6b1fb0695f0..d84b1825521 100644
--- a/compiler-rt/test/lsan/CMakeLists.txt
+++ b/compiler-rt/test/lsan/CMakeLists.txt
@@ -10,7 +10,7 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg
   )
 
-if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT APPLE AND NOT ANDROID)
+if(NOT APPLE AND NOT ANDROID)
   set(LSAN_TEST_DEPS
     ${SANITIZER_COMMON_LIT_TEST_DEPS}
     lsan
diff --git a/compiler-rt/test/msan/CMakeLists.txt b/compiler-rt/test/msan/CMakeLists.txt
new file mode 100644
index 00000000000..3387f82917a
--- /dev/null
+++ b/compiler-rt/test/msan/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(MSAN_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+
+set(MSAN_TEST_DEPS
+  ${SANITIZER_COMMON_LIT_TEST_DEPS}
+  msan)
+
+if(LLVM_INCLUDE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
+  list(APPEND MSAN_TEST_DEPS MsanUnitTests)
+endif()
+
+add_lit_testsuite(check-msan "Running the MemorySanitizer tests"
+  ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${MSAN_TEST_DEPS}
+  )
+set_target_properties(check-msan PROPERTIES FOLDER "MSan tests")
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/getresid.cc b/compiler-rt/test/msan/Linux/getresid.cc
index 5021009e836..5021009e836 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/getresid.cc
+++ b/compiler-rt/test/msan/Linux/getresid.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob.cc b/compiler-rt/test/msan/Linux/glob.cc
index 387ce3cf5f1..387ce3cf5f1 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob.cc
+++ b/compiler-rt/test/msan/Linux/glob.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob_altdirfunc.cc b/compiler-rt/test/msan/Linux/glob_altdirfunc.cc
index b8200c3ee89..b8200c3ee89 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob_altdirfunc.cc
+++ b/compiler-rt/test/msan/Linux/glob_altdirfunc.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob_nomatch.cc b/compiler-rt/test/msan/Linux/glob_nomatch.cc
index 0262034aec5..0262034aec5 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob_nomatch.cc
+++ b/compiler-rt/test/msan/Linux/glob_nomatch.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/aa b/compiler-rt/test/msan/Linux/glob_test_root/aa
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/aa
+++ b/compiler-rt/test/msan/Linux/glob_test_root/aa
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/ab b/compiler-rt/test/msan/Linux/glob_test_root/ab
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/ab
+++ b/compiler-rt/test/msan/Linux/glob_test_root/ab
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/ba b/compiler-rt/test/msan/Linux/glob_test_root/ba
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/glob_test_root/ba
+++ b/compiler-rt/test/msan/Linux/glob_test_root/ba
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/lit.local.cfg b/compiler-rt/test/msan/Linux/lit.local.cfg
index 57271b8078a..57271b8078a 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/lit.local.cfg
+++ b/compiler-rt/test/msan/Linux/lit.local.cfg
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/syscalls.cc b/compiler-rt/test/msan/Linux/syscalls.cc
index ab5be380221..ab5be380221 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/syscalls.cc
+++ b/compiler-rt/test/msan/Linux/syscalls.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/tcgetattr.cc b/compiler-rt/test/msan/Linux/tcgetattr.cc
index e6e101db884..e6e101db884 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/tcgetattr.cc
+++ b/compiler-rt/test/msan/Linux/tcgetattr.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/xattr.cc b/compiler-rt/test/msan/Linux/xattr.cc
index 583b2e3a9bd..583b2e3a9bd 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/xattr.cc
+++ b/compiler-rt/test/msan/Linux/xattr.cc
diff --git a/compiler-rt/lib/msan/lit_tests/Linux/xattr_test_root/a b/compiler-rt/test/msan/Linux/xattr_test_root/a
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/Linux/xattr_test_root/a
+++ b/compiler-rt/test/msan/Linux/xattr_test_root/a
diff --git a/compiler-rt/lib/msan/lit_tests/SharedLibs/dso-origin-so.cc b/compiler-rt/test/msan/SharedLibs/dso-origin-so.cc
index 8930a715924..8930a715924 100644
--- a/compiler-rt/lib/msan/lit_tests/SharedLibs/dso-origin-so.cc
+++ b/compiler-rt/test/msan/SharedLibs/dso-origin-so.cc
diff --git a/compiler-rt/lib/msan/lit_tests/SharedLibs/dso-origin.h b/compiler-rt/test/msan/SharedLibs/dso-origin.h
index ff926b3f61c..ff926b3f61c 100644
--- a/compiler-rt/lib/msan/lit_tests/SharedLibs/dso-origin.h
+++ b/compiler-rt/test/msan/SharedLibs/dso-origin.h
diff --git a/compiler-rt/lib/msan/lit_tests/SharedLibs/lit.local.cfg b/compiler-rt/test/msan/SharedLibs/lit.local.cfg
index b3677c17a0f..b3677c17a0f 100644
--- a/compiler-rt/lib/msan/lit_tests/SharedLibs/lit.local.cfg
+++ b/compiler-rt/test/msan/SharedLibs/lit.local.cfg
diff --git a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/test/msan/Unit/lit.site.cfg.in
index 34ae3c0e017..dc0e9613d59 100644
--- a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/test/msan/Unit/lit.site.cfg.in
@@ -9,5 +9,6 @@ config.name = 'MemorySanitizer-Unit'
 
 # Setup test source and exec root. For unit tests, we define
 # it as build directory with MSan unit tests.
-config.test_exec_root = "@MSAN_BINARY_DIR@/tests"
+# FIXME: Don't use hardcoded path to MSan unit tests.
+config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/msan/tests"
 config.test_source_root = config.test_exec_root
diff --git a/compiler-rt/lib/msan/lit_tests/allocator_returns_null.cc b/compiler-rt/test/msan/allocator_returns_null.cc
index aaa85cce711..aaa85cce711 100644
--- a/compiler-rt/lib/msan/lit_tests/allocator_returns_null.cc
+++ b/compiler-rt/test/msan/allocator_returns_null.cc
diff --git a/compiler-rt/lib/msan/lit_tests/backtrace.cc b/compiler-rt/test/msan/backtrace.cc
index 48684c29c60..48684c29c60 100644
--- a/compiler-rt/lib/msan/lit_tests/backtrace.cc
+++ b/compiler-rt/test/msan/backtrace.cc
diff --git a/compiler-rt/lib/msan/lit_tests/c-strdup.c b/compiler-rt/test/msan/c-strdup.c
index 7772f0f307b..7772f0f307b 100644
--- a/compiler-rt/lib/msan/lit_tests/c-strdup.c
+++ b/compiler-rt/test/msan/c-strdup.c
diff --git a/compiler-rt/lib/msan/lit_tests/cxa_atexit.cc b/compiler-rt/test/msan/cxa_atexit.cc
index f3641aadce0..f3641aadce0 100644
--- a/compiler-rt/lib/msan/lit_tests/cxa_atexit.cc
+++ b/compiler-rt/test/msan/cxa_atexit.cc
diff --git a/compiler-rt/lib/msan/lit_tests/default_blacklist.cc b/compiler-rt/test/msan/default_blacklist.cc
index 32cc02257cb..32cc02257cb 100644
--- a/compiler-rt/lib/msan/lit_tests/default_blacklist.cc
+++ b/compiler-rt/test/msan/default_blacklist.cc
diff --git a/compiler-rt/lib/msan/lit_tests/dlerror.cc b/compiler-rt/test/msan/dlerror.cc
index 281b3164fd7..281b3164fd7 100644
--- a/compiler-rt/lib/msan/lit_tests/dlerror.cc
+++ b/compiler-rt/test/msan/dlerror.cc
diff --git a/compiler-rt/lib/msan/lit_tests/dso-origin.cc b/compiler-rt/test/msan/dso-origin.cc
index 13661c65e74..13661c65e74 100644
--- a/compiler-rt/lib/msan/lit_tests/dso-origin.cc
+++ b/compiler-rt/test/msan/dso-origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/dtls_test.c b/compiler-rt/test/msan/dtls_test.c
index c88e50f1df0..c88e50f1df0 100644
--- a/compiler-rt/lib/msan/lit_tests/dtls_test.c
+++ b/compiler-rt/test/msan/dtls_test.c
diff --git a/compiler-rt/lib/msan/lit_tests/errno.cc b/compiler-rt/test/msan/errno.cc
index af27ad0b032..af27ad0b032 100644
--- a/compiler-rt/lib/msan/lit_tests/errno.cc
+++ b/compiler-rt/test/msan/errno.cc
diff --git a/compiler-rt/lib/msan/lit_tests/getaddrinfo-positive.cc b/compiler-rt/test/msan/getaddrinfo-positive.cc
index 7fde1fdfab9..7fde1fdfab9 100644
--- a/compiler-rt/lib/msan/lit_tests/getaddrinfo-positive.cc
+++ b/compiler-rt/test/msan/getaddrinfo-positive.cc
diff --git a/compiler-rt/lib/msan/lit_tests/getaddrinfo.cc b/compiler-rt/test/msan/getaddrinfo.cc
index 0518cf4733d..0518cf4733d 100644
--- a/compiler-rt/lib/msan/lit_tests/getaddrinfo.cc
+++ b/compiler-rt/test/msan/getaddrinfo.cc
diff --git a/compiler-rt/lib/msan/lit_tests/getline.cc b/compiler-rt/test/msan/getline.cc
index 27168a88560..27168a88560 100644
--- a/compiler-rt/lib/msan/lit_tests/getline.cc
+++ b/compiler-rt/test/msan/getline.cc
diff --git a/compiler-rt/lib/msan/lit_tests/getline_test_data b/compiler-rt/test/msan/getline_test_data
index 5ba1d4cec0d..5ba1d4cec0d 100644
--- a/compiler-rt/lib/msan/lit_tests/getline_test_data
+++ b/compiler-rt/test/msan/getline_test_data
diff --git a/compiler-rt/lib/msan/lit_tests/heap-origin.cc b/compiler-rt/test/msan/heap-origin.cc
index dfe7edd27e8..dfe7edd27e8 100644
--- a/compiler-rt/lib/msan/lit_tests/heap-origin.cc
+++ b/compiler-rt/test/msan/heap-origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/iconv.cc b/compiler-rt/test/msan/iconv.cc
index e7c30edd985..e7c30edd985 100644
--- a/compiler-rt/lib/msan/lit_tests/iconv.cc
+++ b/compiler-rt/test/msan/iconv.cc
diff --git a/compiler-rt/lib/msan/lit_tests/if_indextoname.cc b/compiler-rt/test/msan/if_indextoname.cc
index 7a5ba359953..7a5ba359953 100644
--- a/compiler-rt/lib/msan/lit_tests/if_indextoname.cc
+++ b/compiler-rt/test/msan/if_indextoname.cc
diff --git a/compiler-rt/lib/msan/lit_tests/ifaddrs.cc b/compiler-rt/test/msan/ifaddrs.cc
index fe11a9542dd..fe11a9542dd 100644
--- a/compiler-rt/lib/msan/lit_tests/ifaddrs.cc
+++ b/compiler-rt/test/msan/ifaddrs.cc
diff --git a/compiler-rt/lib/msan/lit_tests/initgroups.cc b/compiler-rt/test/msan/initgroups.cc
index adba5369579..adba5369579 100644
--- a/compiler-rt/lib/msan/lit_tests/initgroups.cc
+++ b/compiler-rt/test/msan/initgroups.cc
diff --git a/compiler-rt/lib/msan/lit_tests/inline.cc b/compiler-rt/test/msan/inline.cc
index 4aeb15583f8..4aeb15583f8 100644
--- a/compiler-rt/lib/msan/lit_tests/inline.cc
+++ b/compiler-rt/test/msan/inline.cc
diff --git a/compiler-rt/lib/msan/lit_tests/insertvalue_origin.cc b/compiler-rt/test/msan/insertvalue_origin.cc
index 769ea45f8c4..769ea45f8c4 100644
--- a/compiler-rt/lib/msan/lit_tests/insertvalue_origin.cc
+++ b/compiler-rt/test/msan/insertvalue_origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/ioctl.cc b/compiler-rt/test/msan/ioctl.cc
index caff80c2e5d..caff80c2e5d 100644
--- a/compiler-rt/lib/msan/lit_tests/ioctl.cc
+++ b/compiler-rt/test/msan/ioctl.cc
diff --git a/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc b/compiler-rt/test/msan/ioctl_custom.cc
index 94ed528c70b..94ed528c70b 100644
--- a/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc
+++ b/compiler-rt/test/msan/ioctl_custom.cc
diff --git a/compiler-rt/lib/msan/lit_tests/ioctl_sound.cc b/compiler-rt/test/msan/ioctl_sound.cc
index 0611e0dc434..0611e0dc434 100644
--- a/compiler-rt/lib/msan/lit_tests/ioctl_sound.cc
+++ b/compiler-rt/test/msan/ioctl_sound.cc
diff --git a/compiler-rt/lib/msan/lit_tests/keep-going-dso.cc b/compiler-rt/test/msan/keep-going-dso.cc
index 6d006756a11..6d006756a11 100644
--- a/compiler-rt/lib/msan/lit_tests/keep-going-dso.cc
+++ b/compiler-rt/test/msan/keep-going-dso.cc
diff --git a/compiler-rt/lib/msan/lit_tests/keep-going.cc b/compiler-rt/test/msan/keep-going.cc
index e33b137c76f..e33b137c76f 100644
--- a/compiler-rt/lib/msan/lit_tests/keep-going.cc
+++ b/compiler-rt/test/msan/keep-going.cc
diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg
new file mode 100644
index 00000000000..3031e6aed63
--- /dev/null
+++ b/compiler-rt/test/msan/lit.cfg
@@ -0,0 +1,31 @@
+# -*- Python -*-
+
+import os
+
+# Setup config name.
+config.name = 'MemorySanitizer'
+
+# Setup source root.
+config.test_source_root = os.path.dirname(__file__)
+
+# Setup default compiler flags used with -fsanitize=memory option.
+clang_msan_cflags = ["-fsanitize=memory",
+                     "-mno-omit-leaf-frame-pointer",
+                     "-fno-omit-frame-pointer",
+                     "-fno-optimize-sibling-calls",
+                     "-g",
+                     "-m64"]
+clang_msan_cxxflags = ["--driver-mode=g++ "] + clang_msan_cflags
+config.substitutions.append( ("%clang_msan ",
+                              " ".join([config.clang] + clang_msan_cflags) + 
+                              " ") )
+config.substitutions.append( ("%clangxx_msan ",
+                              " ".join([config.clang] + clang_msan_cxxflags) + 
+                              " ") )
+
+# Default test suffixes.
+config.suffixes = ['.c', '.cc', '.cpp']
+
+# MemorySanitizer tests are currently supported on Linux only.
+if config.host_os not in ['Linux']:
+  config.unsupported = True
diff --git a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in b/compiler-rt/test/msan/lit.site.cfg.in
index 6d1eccc01da..fb22a57a9e6 100644
--- a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/test/msan/lit.site.cfg.in
@@ -2,4 +2,4 @@
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
-lit_config.load_config(config, "@MSAN_SOURCE_DIR@/lit_tests/lit.cfg")
+lit_config.load_config(config, "@MSAN_LIT_SOURCE_DIR@/lit.cfg")
diff --git a/compiler-rt/lib/msan/lit_tests/malloc_hook.cc b/compiler-rt/test/msan/malloc_hook.cc
index fc68fbc35fb..fc68fbc35fb 100644
--- a/compiler-rt/lib/msan/lit_tests/malloc_hook.cc
+++ b/compiler-rt/test/msan/malloc_hook.cc
diff --git a/compiler-rt/lib/msan/lit_tests/mmap_below_shadow.cc b/compiler-rt/test/msan/mmap_below_shadow.cc
index eb8b0e98189..eb8b0e98189 100644
--- a/compiler-rt/lib/msan/lit_tests/mmap_below_shadow.cc
+++ b/compiler-rt/test/msan/mmap_below_shadow.cc
diff --git a/compiler-rt/lib/msan/lit_tests/no_sanitize_memory.cc b/compiler-rt/test/msan/no_sanitize_memory.cc
index 48afc17e35e..48afc17e35e 100644
--- a/compiler-rt/lib/msan/lit_tests/no_sanitize_memory.cc
+++ b/compiler-rt/test/msan/no_sanitize_memory.cc
diff --git a/compiler-rt/lib/msan/lit_tests/no_sanitize_memory_prop.cc b/compiler-rt/test/msan/no_sanitize_memory_prop.cc
index 35515247885..35515247885 100644
--- a/compiler-rt/lib/msan/lit_tests/no_sanitize_memory_prop.cc
+++ b/compiler-rt/test/msan/no_sanitize_memory_prop.cc
diff --git a/compiler-rt/lib/msan/lit_tests/poison_in_free.cc b/compiler-rt/test/msan/poison_in_free.cc
index f134d05abb1..f134d05abb1 100644
--- a/compiler-rt/lib/msan/lit_tests/poison_in_free.cc
+++ b/compiler-rt/test/msan/poison_in_free.cc
diff --git a/compiler-rt/lib/msan/lit_tests/pthread_getattr_np_deadlock.cc b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
index 44dfc19b956..44dfc19b956 100644
--- a/compiler-rt/lib/msan/lit_tests/pthread_getattr_np_deadlock.cc
+++ b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
diff --git a/compiler-rt/lib/msan/lit_tests/ptrace.cc b/compiler-rt/test/msan/ptrace.cc
index d0e83eabd6a..d0e83eabd6a 100644
--- a/compiler-rt/lib/msan/lit_tests/ptrace.cc
+++ b/compiler-rt/test/msan/ptrace.cc
diff --git a/compiler-rt/lib/msan/lit_tests/readdir64.cc b/compiler-rt/test/msan/readdir64.cc
index 0ec106c741f..0ec106c741f 100644
--- a/compiler-rt/lib/msan/lit_tests/readdir64.cc
+++ b/compiler-rt/test/msan/readdir64.cc
diff --git a/compiler-rt/lib/msan/lit_tests/scandir.cc b/compiler-rt/test/msan/scandir.cc
index 94672e1adbe..94672e1adbe 100644
--- a/compiler-rt/lib/msan/lit_tests/scandir.cc
+++ b/compiler-rt/test/msan/scandir.cc
diff --git a/compiler-rt/lib/msan/lit_tests/scandir_null.cc b/compiler-rt/test/msan/scandir_null.cc
index 84af7f418d2..84af7f418d2 100644
--- a/compiler-rt/lib/msan/lit_tests/scandir_null.cc
+++ b/compiler-rt/test/msan/scandir_null.cc
diff --git a/compiler-rt/lib/msan/lit_tests/scandir_test_root/aaa b/compiler-rt/test/msan/scandir_test_root/aaa
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/scandir_test_root/aaa
+++ b/compiler-rt/test/msan/scandir_test_root/aaa
diff --git a/compiler-rt/lib/msan/lit_tests/scandir_test_root/aab b/compiler-rt/test/msan/scandir_test_root/aab
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/scandir_test_root/aab
+++ b/compiler-rt/test/msan/scandir_test_root/aab
diff --git a/compiler-rt/lib/msan/lit_tests/scandir_test_root/bbb b/compiler-rt/test/msan/scandir_test_root/bbb
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/msan/lit_tests/scandir_test_root/bbb
+++ b/compiler-rt/test/msan/scandir_test_root/bbb
diff --git a/compiler-rt/lib/msan/lit_tests/select.cc b/compiler-rt/test/msan/select.cc
index a169a2dd911..a169a2dd911 100644
--- a/compiler-rt/lib/msan/lit_tests/select.cc
+++ b/compiler-rt/test/msan/select.cc
diff --git a/compiler-rt/lib/msan/lit_tests/select_origin.cc b/compiler-rt/test/msan/select_origin.cc
index f6f6a61b415..f6f6a61b415 100644
--- a/compiler-rt/lib/msan/lit_tests/select_origin.cc
+++ b/compiler-rt/test/msan/select_origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/setlocale.cc b/compiler-rt/test/msan/setlocale.cc
index a22b744d74d..a22b744d74d 100644
--- a/compiler-rt/lib/msan/lit_tests/setlocale.cc
+++ b/compiler-rt/test/msan/setlocale.cc
diff --git a/compiler-rt/lib/msan/lit_tests/signal_stress_test.cc b/compiler-rt/test/msan/signal_stress_test.cc
index ea75eae1bda..ea75eae1bda 100644
--- a/compiler-rt/lib/msan/lit_tests/signal_stress_test.cc
+++ b/compiler-rt/test/msan/signal_stress_test.cc
diff --git a/compiler-rt/lib/msan/lit_tests/sigwait.cc b/compiler-rt/test/msan/sigwait.cc
index 29aa86c938f..29aa86c938f 100644
--- a/compiler-rt/lib/msan/lit_tests/sigwait.cc
+++ b/compiler-rt/test/msan/sigwait.cc
diff --git a/compiler-rt/lib/msan/lit_tests/sigwaitinfo.cc b/compiler-rt/test/msan/sigwaitinfo.cc
index d4f004598a6..d4f004598a6 100644
--- a/compiler-rt/lib/msan/lit_tests/sigwaitinfo.cc
+++ b/compiler-rt/test/msan/sigwaitinfo.cc
diff --git a/compiler-rt/lib/msan/lit_tests/stack-origin.cc b/compiler-rt/test/msan/stack-origin.cc
index b0b05d9658b..b0b05d9658b 100644
--- a/compiler-rt/lib/msan/lit_tests/stack-origin.cc
+++ b/compiler-rt/test/msan/stack-origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/strerror_r-non-gnu.c b/compiler-rt/test/msan/strerror_r-non-gnu.c
index 8fb47055814..8fb47055814 100644
--- a/compiler-rt/lib/msan/lit_tests/strerror_r-non-gnu.c
+++ b/compiler-rt/test/msan/strerror_r-non-gnu.c
diff --git a/compiler-rt/lib/msan/lit_tests/strlen_of_shadow.cc b/compiler-rt/test/msan/strlen_of_shadow.cc
index cb2530e8fdd..cb2530e8fdd 100644
--- a/compiler-rt/lib/msan/lit_tests/strlen_of_shadow.cc
+++ b/compiler-rt/test/msan/strlen_of_shadow.cc
diff --git a/compiler-rt/lib/msan/lit_tests/sync_lock_set_and_test.cc b/compiler-rt/test/msan/sync_lock_set_and_test.cc
index 1023b3e5436..1023b3e5436 100644
--- a/compiler-rt/lib/msan/lit_tests/sync_lock_set_and_test.cc
+++ b/compiler-rt/test/msan/sync_lock_set_and_test.cc
diff --git a/compiler-rt/lib/msan/lit_tests/textdomain.cc b/compiler-rt/test/msan/textdomain.cc
index e3968233a9b..e3968233a9b 100644
--- a/compiler-rt/lib/msan/lit_tests/textdomain.cc
+++ b/compiler-rt/test/msan/textdomain.cc
diff --git a/compiler-rt/lib/msan/lit_tests/times.cc b/compiler-rt/test/msan/times.cc
index 1b7d00052fc..1b7d00052fc 100644
--- a/compiler-rt/lib/msan/lit_tests/times.cc
+++ b/compiler-rt/test/msan/times.cc
diff --git a/compiler-rt/lib/msan/lit_tests/tls_reuse.cc b/compiler-rt/test/msan/tls_reuse.cc
index e1de7e87a1e..e1de7e87a1e 100644
--- a/compiler-rt/lib/msan/lit_tests/tls_reuse.cc
+++ b/compiler-rt/test/msan/tls_reuse.cc
diff --git a/compiler-rt/lib/msan/lit_tests/tzset.cc b/compiler-rt/test/msan/tzset.cc
index 7e1c2cfad56..7e1c2cfad56 100644
--- a/compiler-rt/lib/msan/lit_tests/tzset.cc
+++ b/compiler-rt/test/msan/tzset.cc
diff --git a/compiler-rt/lib/msan/lit_tests/unaligned_read_origin.cc b/compiler-rt/test/msan/unaligned_read_origin.cc
index fa29ab69de1..fa29ab69de1 100644
--- a/compiler-rt/lib/msan/lit_tests/unaligned_read_origin.cc
+++ b/compiler-rt/test/msan/unaligned_read_origin.cc
diff --git a/compiler-rt/lib/msan/lit_tests/use-after-free.cc b/compiler-rt/test/msan/use-after-free.cc
index ac47c0233a1..ac47c0233a1 100644
--- a/compiler-rt/lib/msan/lit_tests/use-after-free.cc
+++ b/compiler-rt/test/msan/use-after-free.cc
diff --git a/compiler-rt/lib/msan/lit_tests/vector_cvt.cc b/compiler-rt/test/msan/vector_cvt.cc
index c200c77de96..c200c77de96 100644
--- a/compiler-rt/lib/msan/lit_tests/vector_cvt.cc
+++ b/compiler-rt/test/msan/vector_cvt.cc
diff --git a/compiler-rt/lib/msan/lit_tests/vector_select.cc b/compiler-rt/test/msan/vector_select.cc
index e8d55423293..e8d55423293 100644
--- a/compiler-rt/lib/msan/lit_tests/vector_select.cc
+++ b/compiler-rt/test/msan/vector_select.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls.cc b/compiler-rt/test/msan/wrap_indirect_calls.cc
index b4bac1ecbd2..b4bac1ecbd2 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/caller.cc b/compiler-rt/test/msan/wrap_indirect_calls/caller.cc
index a0af8b7bb0c..a0af8b7bb0c 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/caller.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls/caller.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/lit.local.cfg b/compiler-rt/test/msan/wrap_indirect_calls/lit.local.cfg
index 5e01230c098..5e01230c098 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/lit.local.cfg
+++ b/compiler-rt/test/msan/wrap_indirect_calls/lit.local.cfg
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/one.cc b/compiler-rt/test/msan/wrap_indirect_calls/one.cc
index ab7bf4125c0..ab7bf4125c0 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/one.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls/one.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/two.cc b/compiler-rt/test/msan/wrap_indirect_calls/two.cc
index c939a993bc9..c939a993bc9 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/two.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls/two.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/wrapper.cc b/compiler-rt/test/msan/wrap_indirect_calls/wrapper.cc
index 8fcd0c635d9..8fcd0c635d9 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls/wrapper.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls/wrapper.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls2.cc b/compiler-rt/test/msan/wrap_indirect_calls2.cc
index c188047ce50..c188047ce50 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls2.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls2.cc
diff --git a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls_in_rtl.cc b/compiler-rt/test/msan/wrap_indirect_calls_in_rtl.cc
index 0d9051ba70f..0d9051ba70f 100644
--- a/compiler-rt/lib/msan/lit_tests/wrap_indirect_calls_in_rtl.cc
+++ b/compiler-rt/test/msan/wrap_indirect_calls_in_rtl.cc