[compiler-rt] r201399 - Move shared configs for lit test suites to test/ and unittests/ directories
Alexey Samsonov
samsonov at google.com
Fri Feb 14 03:00:08 PST 2014
Author: samsonov
Date: Fri Feb 14 05:00:07 2014
New Revision: 201399
URL: http://llvm.org/viewvc/llvm-project?rev=201399&view=rev
Log:
Move shared configs for lit test suites to test/ and unittests/ directories
Added:
compiler-rt/trunk/test/CMakeLists.txt
compiler-rt/trunk/test/lit.common.cfg
- copied unchanged from r201396, compiler-rt/trunk/lib/lit.common.cfg
compiler-rt/trunk/test/lit.common.configured.in
- copied, changed from r201396, compiler-rt/trunk/lib/lit.common.configured.in
compiler-rt/trunk/unittests/
compiler-rt/trunk/unittests/CMakeLists.txt
compiler-rt/trunk/unittests/lit.common.unit.cfg
- copied unchanged from r201396, compiler-rt/trunk/lib/lit.common.unit.cfg
compiler-rt/trunk/unittests/lit.common.unit.configured.in
- copied, changed from r201396, compiler-rt/trunk/lib/lit.common.unit.configured.in
Removed:
compiler-rt/trunk/lib/lit.common.cfg
compiler-rt/trunk/lib/lit.common.configured.in
compiler-rt/trunk/lib/lit.common.unit.cfg
compiler-rt/trunk/lib/lit.common.unit.configured.in
Modified:
compiler-rt/trunk/CMakeLists.txt
compiler-rt/trunk/lib/CMakeLists.txt
compiler-rt/trunk/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in
compiler-rt/trunk/lib/dfsan/lit_tests/lit.site.cfg.in
compiler-rt/trunk/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
compiler-rt/trunk/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
compiler-rt/trunk/lib/lsan/lit_tests/Unit/lit.site.cfg.in
compiler-rt/trunk/lib/msan/lit_tests/Unit/lit.site.cfg.in
compiler-rt/trunk/lib/msan/lit_tests/lit.site.cfg.in
compiler-rt/trunk/lib/sanitizer_common/tests/lit.site.cfg.in
compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in
compiler-rt/trunk/lib/tsan/lit_tests/lit.site.cfg.in
compiler-rt/trunk/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
compiler-rt/trunk/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Fri Feb 14 05:00:07 2014
@@ -248,8 +248,6 @@ endif()
add_subdirectory(lib)
if(LLVM_INCLUDE_TESTS)
- # Currently the tests have not been ported to CMake, so disable this
- # directory.
- #
- #add_subdirectory(test)
+ add_subdirectory(test)
+ add_subdirectory(unittests)
endif()
Modified: compiler-rt/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/CMakeLists.txt?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/CMakeLists.txt Fri Feb 14 05:00:07 2014
@@ -34,13 +34,3 @@ if(LLVM_USE_SANITIZER STREQUAL "")
endif()
add_subdirectory(builtins)
-
-# 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/GenericConfig/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -11,7 +11,7 @@ config.bits = "@ASAN_TEST_BITS@"
config.android = "@CAN_TARGET_arm_android@"
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+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, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
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=201399&r1=201398&r2=201399&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 Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'AddressSanitizer-Unit'
Modified: compiler-rt/trunk/lib/dfsan/lit_tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/dfsan/lit_tests/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/dfsan/lit_tests/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/dfsan/lit_tests/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+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, "@DFSAN_SOURCE_DIR@/lit_tests/lit.cfg")
Removed: compiler-rt/trunk/lib/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lit.common.cfg?rev=201398&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lit.common.cfg (original)
+++ compiler-rt/trunk/lib/lit.common.cfg (removed)
@@ -1,59 +0,0 @@
-# -*- Python -*-
-
-# Configuration file for 'lit' test runner.
-# This file contains common rules for various compiler-rt testsuites.
-# It is mostly copied from lit.cfg used by Clang.
-import os
-import platform
-
-import lit.formats
-
-# Setup test format
-execute_external = (platform.system() != 'Windows'
- or lit_config.getBashPath() not in [None, ""])
-config.test_format = lit.formats.ShTest(execute_external)
-
-# Setup clang binary.
-clang_path = getattr(config, 'clang', None)
-if (not clang_path) or (not os.path.exists(clang_path)):
- lit_config.fatal("Can't find Clang on path %r" % clang_path)
-
-# Clear some environment variables that might affect Clang.
-possibly_dangerous_env_vars = ['COMPILER_PATH', 'RC_DEBUG_OPTIONS',
- 'CINDEXTEST_PREAMBLE_FILE', 'LIBRARY_PATH',
- 'CPATH', 'C_INCLUDE_PATH', 'CPLUS_INCLUDE_PATH',
- 'OBJC_INCLUDE_PATH', 'OBJCPLUS_INCLUDE_PATH',
- 'LIBCLANG_TIMING', 'LIBCLANG_OBJTRACKING',
- 'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX',
- 'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS',
- 'LIBCLANG_RESOURCE_USAGE',
- 'LIBCLANG_CODE_COMPLETION_LOGGING']
-# Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it.
-if platform.system() != 'Windows':
- possibly_dangerous_env_vars.append('INCLUDE')
-for name in possibly_dangerous_env_vars:
- if name in config.environment:
- del config.environment[name]
-
-# Tweak PATH to include llvm tools dir.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)):
- lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir)
-path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-config.environment['PATH'] = path
-
-# Use ugly construction to explicitly prohibit "clang", "clang++" etc.
-# in RUN lines.
-config.substitutions.append(
- (' clang', """\n\n*** Do not use 'clangXXX' in tests,
- instead define '%clangXXX' substitution in lit config. ***\n\n""") )
-
-# Add supported compiler_rt architectures to a list of available features.
-compiler_rt_arch = getattr(config, 'compiler_rt_arch', None)
-if compiler_rt_arch:
- for arch in compiler_rt_arch.split(";"):
- config.available_features.add(arch + "-supported-target")
-
-compiler_rt_debug = getattr(config, 'compiler_rt_debug', False)
-if not compiler_rt_debug:
- config.available_features.add('compiler-rt-optimized')
Removed: compiler-rt/trunk/lib/lit.common.configured.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lit.common.configured.in?rev=201398&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lit.common.configured.in (original)
+++ compiler-rt/trunk/lib/lit.common.configured.in (removed)
@@ -1,32 +0,0 @@
-## Autogenerated by LLVM/Clang configuration.
-# Do not edit!
-
-# Set attribute value if it is unset.
-def set_default(attr, value):
- if not getattr(config, attr, None):
- setattr(config, attr, value)
-
-# Generic config options for all compiler-rt lit tests.
-set_default("target_triple", "@TARGET_TRIPLE@")
-set_default("host_arch", "@HOST_ARCH@")
-set_default("host_os", "@HOST_OS@")
-set_default("llvm_build_mode", "@LLVM_BUILD_MODE@")
-set_default("llvm_src_root", "@LLVM_SOURCE_DIR@")
-set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
-set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
-set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
-set_default("clang", "@LLVM_BINARY_DIR@/bin/clang")
-set_default("compiler_rt_arch", "@COMPILER_RT_SUPPORTED_ARCH@")
-set_default("python_executable", "@PYTHON_EXECUTABLE@")
-set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@)
-
-# LLVM tools dir can be passed in lit parameters, so try to
-# apply substitution.
-try:
- config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
-except KeyError,e:
- key, = e.args
- lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
-
-# Setup attributes common for all compiler-rt projects.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")
Removed: compiler-rt/trunk/lib/lit.common.unit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lit.common.unit.cfg?rev=201398&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lit.common.unit.cfg (original)
+++ compiler-rt/trunk/lib/lit.common.unit.cfg (removed)
@@ -1,30 +0,0 @@
-# -*- Python -*-
-
-# Configuration file for 'lit' test runner.
-# This file contains common config setup rules for unit tests in various
-# compiler-rt testsuites.
-
-import os
-
-import lit.formats
-
-# Setup test format
-llvm_build_mode = getattr(config, "llvm_build_mode", "Debug")
-config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test")
-
-# Setup test suffixes.
-config.suffixes = []
-
-# Tweak PATH to include llvm tools dir.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)):
- lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir)
-path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-config.environment['PATH'] = path
-
-# Propagate the temp directory. Windows requires this because it uses \Windows\
-# if none of these are present.
-if 'TMP' in os.environ:
- config.environment['TMP'] = os.environ['TMP']
-if 'TEMP' in os.environ:
- config.environment['TEMP'] = os.environ['TEMP']
Removed: 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=201398&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lit.common.unit.configured.in (original)
+++ compiler-rt/trunk/lib/lit.common.unit.configured.in (removed)
@@ -1,24 +0,0 @@
-## 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.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
-config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
-config.llvm_build_mode = "@LLVM_BUILD_MODE@"
-config.host_arch = "@HOST_ARCH@"
-config.host_os = "@HOST_OS@"
-
-# LLVM tools dir and build mode can be passed in lit parameters,
-# so try to apply substitution.
-try:
- config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
- config.llvm_build_mode = config.llvm_build_mode % lit_config.params
-except KeyError,e:
- key, = e.args
- lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
-
-# Setup attributes common for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
Modified: compiler-rt/trunk/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
Modified: compiler-rt/trunk/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
Modified: compiler-rt/trunk/lib/lsan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lit_tests/Unit/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/lsan/lit_tests/Unit/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'LeakSanitizer-Unit'
Modified: compiler-rt/trunk/lib/msan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/lit_tests/Unit/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/msan/lit_tests/Unit/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'MemorySanitizer-Unit'
Modified: compiler-rt/trunk/lib/msan/lit_tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/lit_tests/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/lit_tests/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/msan/lit_tests/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+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")
Modified: compiler-rt/trunk/lib/sanitizer_common/tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'SanitizerCommon-Unit'
Modified: compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg")
Modified: compiler-rt/trunk/lib/tsan/lit_tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+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, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
Modified: compiler-rt/trunk/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
Modified: compiler-rt/trunk/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in?rev=201399&r1=201398&r2=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in Fri Feb 14 05:00:07 2014
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
Added: compiler-rt/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/CMakeLists.txt?rev=201399&view=auto
==============================================================================
--- compiler-rt/trunk/test/CMakeLists.txt (added)
+++ compiler-rt/trunk/test/CMakeLists.txt Fri Feb 14 05:00:07 2014
@@ -0,0 +1,7 @@
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
+
+# BlocksRuntime and builtins testsuites are not yet ported to lit.
+# add_subdirectory(BlocksRuntime)
+# add_subdirectory(builtins)
Copied: compiler-rt/trunk/test/lit.common.configured.in (from r201396, compiler-rt/trunk/lib/lit.common.configured.in)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?p2=compiler-rt/trunk/test/lit.common.configured.in&p1=compiler-rt/trunk/lib/lit.common.configured.in&r1=201396&r2=201399&rev=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lit.common.configured.in (original)
+++ compiler-rt/trunk/test/lit.common.configured.in Fri Feb 14 05:00:07 2014
@@ -29,4 +29,4 @@ except KeyError,e:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
# Setup attributes common for all compiler-rt projects.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg")
Added: compiler-rt/trunk/unittests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/unittests/CMakeLists.txt?rev=201399&view=auto
==============================================================================
--- compiler-rt/trunk/unittests/CMakeLists.txt (added)
+++ compiler-rt/trunk/unittests/CMakeLists.txt Fri Feb 14 05:00:07 2014
@@ -0,0 +1,3 @@
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
Copied: compiler-rt/trunk/unittests/lit.common.unit.configured.in (from r201396, compiler-rt/trunk/lib/lit.common.unit.configured.in)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/unittests/lit.common.unit.configured.in?p2=compiler-rt/trunk/unittests/lit.common.unit.configured.in&p1=compiler-rt/trunk/lib/lit.common.unit.configured.in&r1=201396&r2=201399&rev=201399&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lit.common.unit.configured.in (original)
+++ compiler-rt/trunk/unittests/lit.common.unit.configured.in Fri Feb 14 05:00:07 2014
@@ -21,4 +21,4 @@ except KeyError,e:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
# Setup attributes common for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/unittests/lit.common.unit.cfg")
More information about the llvm-commits
mailing list