[compiler-rt] r261601 - [tests] Always specify correct config.target_arch when configuring test suite.
Alexey Samsonov via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 22 17:34:18 PST 2016
Author: samsonov
Date: Mon Feb 22 19:34:17 2016
New Revision: 261601
URL: http://llvm.org/viewvc/llvm-project?rev=261601&view=rev
Log:
[tests] Always specify correct config.target_arch when configuring test suite.
Modified:
compiler-rt/trunk/test/dfsan/CMakeLists.txt
compiler-rt/trunk/test/dfsan/lit.site.cfg.in
compiler-rt/trunk/test/lsan/CMakeLists.txt
compiler-rt/trunk/test/lsan/lit.site.cfg.in
compiler-rt/trunk/test/msan/CMakeLists.txt
compiler-rt/trunk/test/msan/lit.site.cfg.in
compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in
compiler-rt/trunk/test/tsan/CMakeLists.txt
compiler-rt/trunk/test/tsan/lit.cfg
compiler-rt/trunk/test/tsan/lit.site.cfg.in
compiler-rt/trunk/test/ubsan/lit.site.cfg.in
Modified: compiler-rt/trunk/test/dfsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/CMakeLists.txt?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/dfsan/CMakeLists.txt Mon Feb 22 19:34:17 2016
@@ -8,6 +8,7 @@ if(APPLE)
endif()
foreach(arch ${DFSAN_TEST_ARCH})
+ set(DFSAN_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}" DFSAN_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
Modified: compiler-rt/trunk/test/dfsan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/dfsan/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -1,12 +1,13 @@
## Autogenerated by LLVM/Clang configuration.
# Do not edit!
-# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-
# Tool-specific config options.
config.name_suffix = "@DFSAN_TEST_CONFIG_SUFFIX@"
config.target_cflags = "@DFSAN_TEST_TARGET_CFLAGS@"
+config.target_arch = "@DFSAN_TEST_TARGET_ARCH@"
+
+# Load common config for all compiler-rt lit tests.
+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_LIT_TESTS_DIR@/lit.cfg")
Modified: compiler-rt/trunk/test/lsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/CMakeLists.txt?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/lsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/lsan/CMakeLists.txt Mon Feb 22 19:34:17 2016
@@ -8,6 +8,7 @@ if(APPLE)
endif()
foreach(arch ${LSAN_TEST_ARCH})
+ set(LSAN_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}" LSAN_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
Modified: compiler-rt/trunk/test/lsan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/lsan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/lsan/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -1,13 +1,14 @@
## Autogenerated by LLVM/Clang configuration.
# Do not edit!
-# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-
# Tool-specific config options.
config.name_suffix = "@LSAN_TEST_CONFIG_SUFFIX@"
config.target_cflags = "@LSAN_TEST_TARGET_CFLAGS@"
config.lsan_lit_test_mode = "@LSAN_LIT_TEST_MODE@"
+config.target_arch = "@LSAN_TEST_TARGET_ARCH@"
+
+# Load common config for all compiler-rt lit tests.
+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, "@LSAN_LIT_SOURCE_DIR@/lit.common.cfg")
Modified: compiler-rt/trunk/test/msan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/CMakeLists.txt?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/msan/CMakeLists.txt Mon Feb 22 19:34:17 2016
@@ -8,6 +8,7 @@ if(APPLE)
endif()
foreach(arch ${MSAN_TEST_ARCH})
+ set(MSAN_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}" MSAN_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
Modified: compiler-rt/trunk/test/msan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/msan/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -1,11 +1,13 @@
## Autogenerated by LLVM/Clang configuration.
# Do not edit!
-# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-
# Tool-specific config options.
config.name_suffix = "@MSAN_TEST_CONFIG_SUFFIX@"
config.target_cflags = "@MSAN_TEST_TARGET_CFLAGS@"
+config.target_arch = "@MSAN_TEST_TARGET_ARCH@"
+
+# Load common config for all compiler-rt lit tests.
+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_LIT_SOURCE_DIR@/lit.cfg")
Modified: compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -1,12 +1,12 @@
-# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-
# Tool-specific config options.
config.name_suffix = "@CONFIG_NAME@"
config.tool_name = "@SANITIZER_COMMON_LIT_TEST_MODE@"
config.target_cflags = "@SANITIZER_COMMON_TEST_TARGET_CFLAGS@"
config.target_arch = "@SANITIZER_COMMON_TEST_TARGET_ARCH@"
+# Load common config for all compiler-rt lit tests.
+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, "@SANITIZER_COMMON_LIT_SOURCE_DIR@/lit.common.cfg")
Modified: compiler-rt/trunk/test/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/CMakeLists.txt?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/tsan/CMakeLists.txt Mon Feb 22 19:34:17 2016
@@ -22,6 +22,7 @@ if(APPLE)
endif()
foreach(arch ${TSAN_TEST_ARCH})
+ set(TSAN_TEST_TARGET_ARCH ${arch})
string(TOLOWER "-${arch}" TSAN_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.
Modified: compiler-rt/trunk/test/tsan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/lit.cfg?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/lit.cfg (original)
+++ compiler-rt/trunk/test/tsan/lit.cfg Mon Feb 22 19:34:17 2016
@@ -50,7 +50,7 @@ clang_tsan_cxxflags = config.cxx_mode_fl
if config.has_libcxx and config.host_os != 'Darwin':
# FIXME: Dehardcode this path somehow.
libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib",
- "tsan", "libcxx_tsan_" + config.arch)
+ "tsan", "libcxx_tsan_" + config.target_arch)
libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1")
libcxx_libdir = os.path.join(libcxx_path, "lib")
libcxx_so = os.path.join(libcxx_libdir, "libc++.so")
Modified: compiler-rt/trunk/test/tsan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/tsan/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -2,9 +2,9 @@
# Do not edit!
config.name_suffix = "@TSAN_TEST_CONFIG_SUFFIX@"
-config.arch = "@arch@"
config.has_libcxx = @TSAN_HAS_LIBCXX@
config.target_cflags = "@TSAN_TEST_TARGET_CFLAGS@"
+config.target_arch = "@TSAN_TEST_TARGET_ARCH@"
# Load common config for all compiler-rt lit tests.
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
Modified: compiler-rt/trunk/test/ubsan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/lit.site.cfg.in?rev=261601&r1=261600&r2=261601&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/ubsan/lit.site.cfg.in Mon Feb 22 19:34:17 2016
@@ -1,10 +1,10 @@
-# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-
# Tool-specific config options.
config.ubsan_lit_test_mode = "@UBSAN_LIT_TEST_MODE@"
config.target_cflags = "@UBSAN_TEST_TARGET_CFLAGS@"
config.target_arch = "@UBSAN_TEST_TARGET_ARCH@"
+# Load common config for all compiler-rt lit tests.
+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, "@UBSAN_LIT_TESTS_DIR@/lit.common.cfg")
More information about the llvm-commits
mailing list