[compiler-rt] r260229 - [sanitizer_common] Correct the nits that should have been committed as part of r260227.

[Daniel Sanders via llvm-commits]

Author: dsanders
Date: Tue Feb  9 10:14:31 2016
New Revision: 260229

URL: http://llvm.org/viewvc/llvm-project?rev=260229&view=rev
Log:
[sanitizer_common] Correct the nits that should have been committed as part of r260227.

Modified:
    compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt
    compiler-rt/trunk/test/sanitizer_common/lit.common.cfg
    compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in

Modified: compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt?rev=260229&r1=260228&r2=260229&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt Tue Feb  9 10:14:31 2016
@@ -36,7 +36,6 @@ foreach(tool ${SUPPORTED_TOOLS})
       string(REPLACE ";" " " SANITIZER_COMMON_TEST_TARGET_CFLAGS "${SANITIZER_COMMON_TEST_TARGET_CFLAGS}")
     endif()
     set(CONFIG_NAME ${tool}-${arch}-${OS_NAME})
-    set(SANITIZER_COMMON_TEST_CONFIG_SUFFIX "-${arch}-${OS_NAME}")
     configure_lit_site_cfg(
       ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
       ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg)

Modified: compiler-rt/trunk/test/sanitizer_common/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/lit.common.cfg?rev=260229&r1=260228&r2=260229&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/lit.common.cfg (original)
+++ compiler-rt/trunk/test/sanitizer_common/lit.common.cfg Tue Feb  9 10:14:31 2016
@@ -3,7 +3,7 @@
 # Setup source root.
 config.test_source_root = os.path.join(os.path.dirname(__file__), "TestCases")
 
-config.name = "SanitizerCommon-" + config.tool_name + config.name_suffix
+config.name = "SanitizerCommon-" + config.name_suffix
 
 default_tool_options = []
 if config.tool_name == "asan":

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=260229&r1=260228&r2=260229&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/sanitizer_common/lit.site.cfg.in Tue Feb  9 10:14:31 2016
@@ -2,7 +2,7 @@
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Tool-specific config options.
-config.name_suffix = "@SANITIZER_COMMON_TEST_CONFIG_SUFFIX@"
+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@"