[PATCH] [lsan] Add lit test support.
Sergey Matveev
earthdok at google.com
Wed May 22 07:25:31 PDT 2013
Hi samsonov,
"check-lsan" now runs both the tests from lib/lsan/tests and any lit
tests found under lib/lsan/lit_tests.
http://llvm-reviews.chandlerc.com/D843
Files:
lib/lsan/CMakeLists.txt
lib/lsan/lit_tests/CMakeLists.txt
lib/lsan/lit_tests/Unit/lit.cfg
lib/lsan/tests/lit.cfg
lib/lsan/lit_tests/Unit/lit.site.cfg.in
lib/lsan/tests/lit.site.cfg.in
lib/lsan/lit_tests/lit.cfg
lib/lsan/lit_tests/lit.site.cfg.in
lib/lsan/tests/CMakeLists.txt
Index: lib/lsan/CMakeLists.txt
===================================================================
--- lib/lsan/CMakeLists.txt
+++ lib/lsan/CMakeLists.txt
@@ -46,3 +46,4 @@
endif()
add_subdirectory(tests)
+add_subdirectory(lit_tests)
Index: lib/lsan/lit_tests/CMakeLists.txt
===================================================================
--- /dev/null
+++ lib/lsan/lit_tests/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(LSAN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+set(LSAN_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
+ )
+
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
+ )
+
+if(COMPILER_RT_CAN_EXECUTE_TESTS)
+ set(LSAN_TEST_DEPS
+ ${SANITIZER_COMMON_LIT_TEST_DEPS}
+ ${LSAN_RUNTIME_LIBRARIES})
+ set(LSAN_TEST_PARAMS
+ lsan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+ if(LLVM_INCLUDE_TESTS)
+ list(APPEND LSAN_TEST_DEPS LsanTests)
+ endif()
+ add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
+ ${CMAKE_CURRENT_BINARY_DIR}
+ PARAMS ${LSAN_TEST_PARAMS}
+ DEPENDS ${LSAN_TEST_DEPS})
+ set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")
+endif()
Index: lib/lsan/lit_tests/Unit/lit.cfg
===================================================================
--- lib/lsan/lit_tests/Unit/lit.cfg
+++ lib/lsan/lit_tests/Unit/lit.cfg
@@ -18,12 +18,10 @@
lit.load_config(config, compiler_rt_lit_unit_cfg)
# Setup config name.
-config.name = 'LeakSanitizer'
+config.name = 'AddressSanitizer-Unit'
# Setup test source and exec root. For unit tests, we define
-# it as build directory with lsan unit tests.
-llvm_obj_root = get_required_attr(config, "llvm_obj_root")
-config.test_exec_root = os.path.join(llvm_obj_root, "projects",
- "compiler-rt", "lib",
- "lsan", "tests")
+# it as build directory with LSan unit tests.
+lsan_binary_dir = get_required_attr(config, "lsan_binary_dir")
+config.test_exec_root = os.path.join(lsan_binary_dir, "tests")
config.test_source_root = config.test_exec_root
Index: lib/lsan/lit_tests/Unit/lit.site.cfg.in
===================================================================
--- lib/lsan/lit_tests/Unit/lit.site.cfg.in
+++ lib/lsan/lit_tests/Unit/lit.site.cfg.in
@@ -1,14 +1,16 @@
+## Autogenerated by LLVM/Clang configuration.
+# Do not edit!
+
+config.target_triple = "@TARGET_TRIPLE@"
config.llvm_src_root = "@LLVM_SOURCE_DIR@"
-config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+config.lsan_binary_dir = "@LSAN_BINARY_DIR@"
-# LLVM tools dir can be passed in lit parameters, so try to
-# apply substitution.
try:
config.llvm_build_mode = config.llvm_build_mode % lit.params
-except KeyError, e:
+except KeyError,e:
key, = e.args
lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
# Let the main config do the real work.
-lit.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
+lit.load_config(config, "@LSAN_SOURCE_DIR@/lit_tests/Unit/lit.cfg")
Index: lib/lsan/lit_tests/lit.cfg
===================================================================
--- /dev/null
+++ lib/lsan/lit_tests/lit.cfg
@@ -0,0 +1,52 @@
+# -*- Python -*-
+
+import os
+
+def get_required_attr(config, attr_name):
+ attr_value = getattr(config, attr_name, None)
+ if not attr_value:
+ lit.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 attributes common for all compiler-rt projects.
+llvm_src_root = get_required_attr(config, 'llvm_src_root')
+compiler_rt_lit_unit_cfg = os.path.join(llvm_src_root, "projects",
+ "compiler-rt", "lib",
+ "lit.common.unit.cfg")
+lit.load_config(config, compiler_rt_lit_unit_cfg)
+
+# Setup config name.
+config.name = 'LeakSanitizer'
+
+# Setup source root.
+config.test_source_root = os.path.dirname(__file__)
+
+# Setup attributes common for all compiler-rt projects.
+compiler_rt_lit_cfg = os.path.join(llvm_src_root, "projects", "compiler-rt",
+ "lib", "lit.common.cfg")
+if (not compiler_rt_lit_cfg) or (not os.path.exists(compiler_rt_lit_cfg)):
+ lit.fatal("Can't find common compiler-rt lit config at: %r"
+ % compiler_rt_lit_cfg)
+lit.load_config(config, compiler_rt_lit_cfg)
+
+# Setup default compiler flags used with -fsanitize=leak option.
+clang_lsan_cxxflags = ("-ccc-cxx "
+ + "-fsanitize=leak "
+ + "-g")
+config.substitutions.append( ("%clangxx_lsan ", (" " + config.clang + " " +
+ clang_lsan_cxxflags + " ")) )
+
+# Setup path to external LLVM symbolizer to run LeakSanitizer output tests.
+llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
+if llvm_tools_dir:
+ config.environment['LLVM_SYMBOLIZER_PATH'] = os.path.join(
+ llvm_tools_dir, "llvm-symbolizer")
+
+# Default test suffixes.
+config.suffixes = ['.c', '.cc', '.cpp']
+
+# LeakSanitizer tests are currently supported on Linux only.
+if config.host_os not in ['Linux']:
+ config.unsupported = True
Index: lib/lsan/lit_tests/lit.site.cfg.in
===================================================================
--- lib/lsan/lit_tests/lit.site.cfg.in
+++ lib/lsan/lit_tests/lit.site.cfg.in
@@ -1,12 +1,17 @@
+
+config.host_os = "@HOST_OS@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
config.llvm_src_root = "@LLVM_SOURCE_DIR@"
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.clang = "@LLVM_BINARY_DIR@/bin/clang"
+config.compiler_rt_arch = "@COMPILER_RT_SUPPORTED_ARCH@"
# LLVM tools dir can be passed in lit parameters, so try to
# apply substitution.
try:
- config.llvm_build_mode = config.llvm_build_mode % lit.params
-except KeyError, e:
+ config.llvm_tools_dir = config.llvm_tools_dir % lit.params
+except KeyError,e:
key, = e.args
lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
Index: lib/lsan/tests/CMakeLists.txt
===================================================================
--- lib/lsan/tests/CMakeLists.txt
+++ lib/lsan/tests/CMakeLists.txt
@@ -56,22 +56,3 @@
add_lsan_tests_for_arch(x86_64)
endif()
-configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
-
-if(COMPILER_RT_CAN_EXECUTE_TESTS)
- set(LSAN_TEST_DEPS
- clang clang-headers
- ${LSAN_RUNTIME_LIBRARIES})
- set(LSAN_TEST_PARAMS
- lsan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
- if(LLVM_INCLUDE_TESTS)
- list(APPEND LSAN_TEST_DEPS LsanTests)
- endif()
- add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
- ${CMAKE_CURRENT_BINARY_DIR}
- PARAMS ${LSAN_TEST_PARAMS}
- DEPENDS ${LSAN_TEST_DEPS})
- set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")
-endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D843.1.patch
Type: text/x-patch
Size: 7256 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130522/b28bdaac/attachment.bin>
More information about the llvm-commits
mailing list