[CMake] Put OS on build name, not site name in test.cmake

test.cmake

@@ -15,7 +15,9 @@ macro(endsection)
   endif()
 endmacro()
 
-site_name(CTEST_SITE)
+if(NOT DEFINED CTEST_SITE)
+  site_name(CTEST_SITE)
+endif()
 
 if(EXISTS "/etc/os-release")
   file(STRINGS "/etc/os-release" OS_NAME REGEX "^ID=.*$")
@@ -24,6 +26,7 @@ if(EXISTS "/etc/os-release")
   string(REGEX REPLACE "VERSION_ID=[\"']?([^\"'.]*).*$" "\\1" OS_VERSION "${OS_VERSION}")
   file(STRINGS "/etc/os-release" OS_FULL_NAME REGEX "^PRETTY_NAME=.*$")
   string(REGEX REPLACE "PRETTY_NAME=[\"']?([^\"']*)[\"']?$" "\\1" OS_FULL_NAME "${OS_FULL_NAME}")
+  string(REGEX REPLACE "[ ]*\\(.*\\)" "" OS_FULL_NAME "${OS_FULL_NAME}")
 elseif(APPLE)
   set(OS_NAME "macOS")
   execute_process(COMMAND sw_vers -productVersion
@@ -35,8 +38,6 @@ else()
   set(OS_FULL_NAME "${OS_NAME} ${OS_VERSION}")
 endif()
 
-string(APPEND CTEST_SITE " (${OS_FULL_NAME} - ${CMAKE_SYSTEM_PROCESSOR})")
-
 cmake_host_system_information(RESULT
   NCORES QUERY NUMBER_OF_PHYSICAL_CORES)
 cmake_host_system_information(RESULT
@@ -58,8 +59,6 @@ if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
   endif()
 endif()
 
-set(CTEST_BUILD_NAME "${CMAKE_SYSTEM_NAME}")
-
 execute_process(COMMAND ${CMAKE_COMMAND} --system-information
   OUTPUT_VARIABLE CMAKE_SYSTEM_INFORMATION ERROR_VARIABLE ERROR)
 
@@ -74,6 +73,7 @@ string(REPLACE "GNU" "GCC" COMPILER_ID "${COMPILER_ID}")
 string(REGEX REPLACE ".+CMAKE_CXX_COMPILER_VERSION \"([^\"]+)\".*$" "\\1"
   COMPILER_VERSION "${CMAKE_SYSTEM_INFORMATION}")
 
+set(CTEST_BUILD_NAME "${OS_FULL_NAME}")
 string(APPEND CTEST_BUILD_NAME " ${COMPILER_ID} ${COMPILER_VERSION}")
 string(APPEND CTEST_BUILD_NAME " ${CTEST_CONFIGURATION_TYPE}")
 
@@ -88,6 +88,10 @@ if(NOT CTEST_CMAKE_GENERATOR MATCHES "Makefile")
   string(APPEND CTEST_BUILD_NAME " ${CTEST_CMAKE_GENERATOR}")
 endif()
 
+if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+  string(APPEND CTEST_BUILD_NAME " ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
 if(NOT DEFINED CTEST_SOURCE_DIRECTORY)
   set(CTEST_SOURCE_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
 endif()