From f1884ccb5950b27b2a27ed07b43e2fb9d093bb1c Mon Sep 17 00:00:00 2001
From: Daniel Sanders <daniel.sanders@imgtec.com>
Date: Tue, 9 Feb 2016 16:14:31 +0000
Subject: [PATCH] [sanitizer_common] Correct the nits that should have been
 committed as part of r260227.

llvm-svn: 260229
---
 compiler-rt/test/sanitizer_common/CMakeLists.txt  | 1 -
 compiler-rt/test/sanitizer_common/lit.common.cfg  | 2 +-
 compiler-rt/test/sanitizer_common/lit.site.cfg.in | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt
index 748547a..54b9135 100644
--- a/compiler-rt/test/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt
@@ -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)
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg
index 621bf1f..a930903 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg
@@ -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":
diff --git a/compiler-rt/test/sanitizer_common/lit.site.cfg.in b/compiler-rt/test/sanitizer_common/lit.site.cfg.in
index 8027977..b1e34c8 100644
--- a/compiler-rt/test/sanitizer_common/lit.site.cfg.in
+++ b/compiler-rt/test/sanitizer_common/lit.site.cfg.in
@@ -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@"
-- 
2.7.4