[compiler-rt] r183401 - [ASan] create common autogenerated config for running compiler-rt unit tests, and use it in ASan
Alexey Samsonov
samsonov at google.com
Thu Jun 6 05:48:20 PDT 2013
Author: samsonov
Date: Thu Jun 6 07:48:20 2013
New Revision: 183401
URL: http://llvm.org/viewvc/llvm-project?rev=183401&view=rev
Log:
[ASan] create common autogenerated config for running compiler-rt unit tests, and use it in ASan
Added:
compiler-rt/trunk/lib/lit.common.unit.configured.in
Modified:
compiler-rt/trunk/lib/CMakeLists.txt
compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.cfg
compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in
Modified: compiler-rt/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/CMakeLists.txt?rev=183401&r1=183400&r2=183401&view=diff
==============================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/CMakeLists.txt Thu Jun 6 07:48:20 2013
@@ -19,10 +19,6 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linu
add_subdirectory(lsan)
endif()
-configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
-
# The top-level lib directory contains a large amount of C code which provides
# generic implementations of the core runtime library along with optimized
# architecture-specific code in various subdirectories.
@@ -192,3 +188,13 @@ foreach(arch x86_64 i386)
CFLAGS "-std=c99")
endif()
endforeach()
+
+# Generate configs for running lit and unit tests.
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
+
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
+
Modified: compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.cfg?rev=183401&r1=183400&r2=183401&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.cfg (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.cfg Thu Jun 6 07:48:20 2013
@@ -10,12 +10,6 @@ def get_required_attr(config, attr_name)
"to lit.site.cfg " % attr_name)
return attr_value
-# Setup attributes common for all compiler-rt projects.
-compiler_rt_src_root = get_required_attr(config, 'compiler_rt_src_root')
-compiler_rt_lit_unit_cfg = os.path.join(compiler_rt_src_root, "lib",
- "lit.common.unit.cfg")
-lit.load_config(config, compiler_rt_lit_unit_cfg)
-
# Setup config name.
config.name = 'AddressSanitizer-Unit'
Modified: compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in?rev=183401&r1=183400&r2=183401&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in Thu Jun 6 07:48:20 2013
@@ -1,17 +1,11 @@
## Autogenerated by LLVM/Clang configuration.
# Do not edit!
-config.target_triple = "@TARGET_TRIPLE@"
-config.llvm_src_root = "@LLVM_SOURCE_DIR@"
-config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
-config.llvm_build_mode = "@LLVM_BUILD_MODE@"
-config.asan_binary_dir = "@ASAN_BINARY_DIR@"
+# Load common config for all compiler-rt unit tests.
+lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
-try:
- config.llvm_build_mode = config.llvm_build_mode % lit.params
-except KeyError,e:
- key, = e.args
- lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+# Tool-specific config options.
+config.asan_binary_dir = "@ASAN_BINARY_DIR@"
-# Let the main config do the real work.
+# Load tool-specific config that would do the real work.
lit.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/Unit/lit.cfg")
Added: compiler-rt/trunk/lib/lit.common.unit.configured.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lit.common.unit.configured.in?rev=183401&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lit.common.unit.configured.in (added)
+++ compiler-rt/trunk/lib/lit.common.unit.configured.in Thu Jun 6 07:48:20 2013
@@ -0,0 +1,17 @@
+## Autogenerated by LLVM/Clang configuration.
+# Do not edit!
+
+# Generic config options for all compiler-rt unit tests.
+config.target_triple = "@TARGET_TRIPLE@"
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+
+try:
+ config.llvm_build_mode = config.llvm_build_mode % lit.params
+except KeyError,e:
+ key, = e.args
+ lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+
+# Setup attributes common for all compiler-rt unit tests.
+lit.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
More information about the llvm-commits
mailing list