diff options
Diffstat (limited to 'lib/msan/tests/CMakeLists.txt')
| -rw-r--r-- | lib/msan/tests/CMakeLists.txt | 137 |
1 files changed, 54 insertions, 83 deletions
diff --git a/lib/msan/tests/CMakeLists.txt b/lib/msan/tests/CMakeLists.txt index 9c49f167fa19e..53e1b549b70d7 100644 --- a/lib/msan/tests/CMakeLists.txt +++ b/lib/msan/tests/CMakeLists.txt @@ -5,46 +5,24 @@ include(CompilerRTLink) include_directories(..) include_directories(../..) -# Instrumented libcxx sources and build flags. -file(GLOB MSAN_LIBCXX_SOURCES ${MSAN_LIBCXX_PATH}/src/*.cpp) set(MSAN_LIBCXX_CFLAGS - -I${MSAN_LIBCXX_PATH}/include -fsanitize=memory -fsanitize-memory-track-origins - -fPIC - -Wno-\#warnings - -g - -O2 - -std=c++0x - -fstrict-aliasing - -fno-exceptions - -nostdinc++ - -fno-omit-frame-pointer - -mno-omit-leaf-frame-pointer) -set(MSAN_LIBCXX_LINK_FLAGS - -nodefaultlibs - -lpthread - -lrt - -lc - -lstdc++ - -fsanitize=memory) + -Wno-pedantic) # Unittest sources and build flags. 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${MSAN_LIBCXX_PATH}/include - ${COMPILER_RT_GTEST_INCLUDE_CFLAGS} + -I${COMPILER_RT_LIBCXX_PATH}/include + ${COMPILER_RT_GTEST_CFLAGS} -I${COMPILER_RT_SOURCE_DIR}/include -I${COMPILER_RT_SOURCE_DIR}/lib -I${COMPILER_RT_SOURCE_DIR}/lib/msan - -std=c++0x -stdlib=libc++ -g -O2 @@ -52,6 +30,9 @@ set(MSAN_UNITTEST_COMMON_CFLAGS -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -Wno-deprecated-declarations + -Wno-unused-variable + -Wno-zero-length-array + -Werror=sign-compare ) set(MSAN_UNITTEST_INSTRUMENTED_CFLAGS ${MSAN_UNITTEST_COMMON_CFLAGS} @@ -61,10 +42,11 @@ set(MSAN_UNITTEST_INSTRUMENTED_CFLAGS ) set(MSAN_UNITTEST_LINK_FLAGS -fsanitize=memory - -ldl # FIXME: we build libcxx without cxxabi and need libstdc++ to provide it. -lstdc++ ) + +append_list_if(COMPILER_RT_HAS_LIBDL -ldl MSAN_UNITTEST_LINK_FLAGS) set(MSAN_LOADABLE_LINK_FLAGS -fsanitize=memory -shared @@ -72,20 +54,27 @@ set(MSAN_LOADABLE_LINK_FLAGS # Compile source for the given architecture, using compiler # options in ${ARGN}, and add it to the object list. -macro(msan_compile obj_list source arch) +macro(msan_compile obj_list source arch kind) get_filename_component(basename ${source} NAME) - set(output_obj "${basename}.${arch}.o") + set(output_obj "${basename}.${arch}${kind}.o") get_target_flags_for_arch(${arch} TARGET_CFLAGS) + set(COMPILE_DEPS ${MSAN_UNITTEST_HEADERS}) + if(NOT COMPILER_RT_STANDALONE_BUILD) + list(APPEND COMPILE_DEPS gtest msan) + endif() clang_compile(${output_obj} ${source} CFLAGS ${ARGN} ${TARGET_CFLAGS} - DEPS gtest ${MSAN_RUNTIME_LIBRARIES} ${MSAN_UNITTEST_HEADERS}) + DEPS ${COMPILE_DEPS}) list(APPEND ${obj_list} ${output_obj}) endmacro() -macro(msan_link_shared so_list so_name arch) +macro(msan_link_shared so_list so_name arch kind) parse_arguments(SOURCE "OBJECTS;LINKFLAGS;DEPS" "" ${ARGN}) - set(output_so "${CMAKE_CURRENT_BINARY_DIR}/${so_name}.${arch}.so") + set(output_so "${CMAKE_CURRENT_BINARY_DIR}/${so_name}.${arch}${kind}.so") get_target_flags_for_arch(${arch} TARGET_LINKFLAGS) + if(NOT COMPILER_RT_STANDALONE_BUILD) + list(APPEND SOURCE_DEPS msan) + endif() clang_link_shared(${output_so} OBJECTS ${SOURCE_OBJECTS} LINKFLAGS ${TARGET_LINKFLAGS} ${SOURCE_LINKFLAGS} @@ -93,80 +82,62 @@ macro(msan_link_shared so_list so_name arch) list(APPEND ${so_list} ${output_so}) endmacro() -# Link MSan unit test for a given architecture from a set -# of objects in ${ARGN}. -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} - ${MSAN_LOADABLE_SO} - LINK_FLAGS ${MSAN_UNITTEST_LINK_FLAGS} - ${TARGET_LINK_FLAGS} - "-Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR}") -endmacro() - # Main MemorySanitizer unit tests. add_custom_target(MsanUnitTests) set_target_properties(MsanUnitTests PROPERTIES FOLDER "MSan unit tests") # Adds MSan unit tests and benchmarks for architecture. -macro(add_msan_tests_for_arch arch) +macro(add_msan_tests_for_arch arch kind) + set(LIBCXX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan${kind}) + add_custom_libcxx(libcxx_msan${kind} ${LIBCXX_PREFIX} + DEPS ${MSAN_RUNTIME_LIBRARIES} + CFLAGS ${MSAN_LIBCXX_CFLAGS} ${ARGN}) + set(MSAN_LIBCXX_SO ${LIBCXX_PREFIX}/lib/libc++.so) + # Build gtest instrumented with MSan. set(MSAN_INST_GTEST) - msan_compile(MSAN_INST_GTEST ${COMPILER_RT_GTEST_SOURCE} ${arch} - ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS}) - - # Build libcxx instrumented with MSan. - set(MSAN_INST_LIBCXX_OBJECTS) - foreach(SOURCE ${MSAN_LIBCXX_SOURCES}) - msan_compile(MSAN_INST_LIBCXX_OBJECTS ${SOURCE} ${arch} - ${MSAN_LIBCXX_CFLAGS}) - endforeach(SOURCE) - - set(MSAN_INST_LIBCXX) - 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}) + msan_compile(MSAN_INST_GTEST ${COMPILER_RT_GTEST_SOURCE} ${arch} "${kind}" + ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN}) # Instrumented tests. set(MSAN_INST_TEST_OBJECTS) foreach (SOURCE ${MSAN_UNITTEST_SOURCES}) - msan_compile(MSAN_INST_TEST_OBJECTS ${SOURCE} ${arch} - ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS}) + msan_compile(MSAN_INST_TEST_OBJECTS ${SOURCE} ${arch} "${kind}" + ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN}) endforeach(SOURCE) # Instrumented loadable module objects. set(MSAN_INST_LOADABLE_OBJECTS) - msan_compile(MSAN_INST_LOADABLE_OBJECTS ${MSAN_LOADABLE_SOURCE} ${arch} - ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS}) - - # Uninstrumented shared object for MSanDR tests. - set(MSANDR_TEST_OBJECTS) - msan_compile(MSANDR_TEST_OBJECTS ${MSANDR_UNITTEST_SOURCE} ${arch} - ${MSAN_UNITTEST_COMMON_CFLAGS}) + msan_compile(MSAN_INST_LOADABLE_OBJECTS ${MSAN_LOADABLE_SOURCE} ${arch} "${kind}" + ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN}) # Instrumented loadable library tests. set(MSAN_LOADABLE_SO) - msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch} + msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch} "${kind}" OBJECTS ${MSAN_INST_LOADABLE_OBJECTS} - DEPS ${MSAN_INST_LOADABLE_OBJECTS} ${MSAN_RUNTIME_LIBRARIES}) - - # 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 ${MSAN_INST_LOADABLE_OBJECTS}) - # Link everything together. - add_msan_test(MsanUnitTests "Msan-${arch}-Test" ${arch} - ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST} - ${MSAN_INST_LIBCXX} ${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) + list(APPEND MSAN_TEST_DEPS msan) + endif() + get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS) + add_compiler_rt_test(MsanUnitTests "Msan-${arch}${kind}-Test" ${arch} + OBJECTS ${MSAN_TEST_OBJECTS} ${MSAN_LIBCXX_SO} + DEPS ${MSAN_TEST_DEPS} + LINK_FLAGS ${MSAN_UNITTEST_LINK_FLAGS} + ${TARGET_LINK_FLAGS} + "-Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR}" + "-Wl,-rpath=${LIBCXX_PREFIX}/lib") 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) + add_msan_tests_for_arch(x86_64 "") + add_msan_tests_for_arch(x86_64 "-with-call" + -mllvm -msan-instrumentation-with-call-threshold=0) endif() endif() |