[sanitizer_common] Add suffix to lit testsuite name to distinguish subtargets.

[dsanders]

Summary

This fixes duplicate test names in the test results, so:

PASS: SanitizerCommon-asan :: fopen_nullptr.c (304 of 431)
PASS: SanitizerCommon-asan :: fopen_nullptr.c (305 of 431)

is now:

PASS: SanitizerCommon-asan-i386-Linux :: fopen_nullptr.c (282 of 431)             
PASS: SanitizerCommon-asan-x86_64-Linux :: fopen_nullptr.c (316 of 431)

[samsonov]

LGTM. Thank you!

test/sanitizer_common/CMakeLists.txt

39

probably CONFIG_NAME should be enough...

test/sanitizer_common/lit.common.cfg

6

... and this "SanitizerCommon-" + config.name_suffix?

test/sanitizer_common/lit.site.cfg.in

5

Can you just make it "@CONFIG_NAME@"?

[dsanders]

I've just realized I made these changes in one staging area and committed using another. I'll fix this straight away.

[dsanders]

The changes were made in r260229. Sorry for the noise.

test/sanitizer_common/CMakeLists.txt

if(${arch} MATCHES "arm|aarch64")
       # This is only true if we're cross-compiling.
       set(SANITIZER_COMMON_TEST_TARGET_CFLAGS
           ${COMPILER_RT_TEST_COMPILER_CFLAGS})
     else()
       get_target_flags_for_arch(${arch} SANITIZER_COMMON_TEST_TARGET_CFLAGS)
       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)
     list(APPEND SANITIZER_COMMON_TESTSUITES
          ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
   endforeach()
 endforeach()
 

test/sanitizer_common/lit.common.cfg

 # -*- Python -*-
 
 # Setup source root.
 config.test_source_root = os.path.join(os.path.dirname(__file__), "TestCases")
 
-config.name = "SanitizerCommon-" + config.tool_name
+config.name = "SanitizerCommon-" + config.tool_name + config.name_suffix
 
 default_tool_options = []
 if config.tool_name == "asan":
   tool_cflags = ["-fsanitize=address"]
   tool_options = "ASAN_OPTIONS"
 elif config.tool_name == "tsan":
   tool_cflags = ["-fsanitize=thread"]
   tool_options = "TSAN_OPTIONS"

test/sanitizer_common/lit.site.cfg.in

 # 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 = "@SANITIZER_COMMON_TEST_CONFIG_SUFFIX@"
 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 tool-specific config that would do the real work.
 lit_config.load_config(config, "@SANITIZER_COMMON_LIT_SOURCE_DIR@/lit.common.cfg")