[compiler-rt] 08742e7 - compiler-rt/test/metadata: restrict tests to x86_64

Dmitry Vyukov via llvm-commits llvm-commits at lists.llvm.org
Mon Dec 5 06:27:26 PST 2022


Author: Dmitry Vyukov
Date: 2022-12-05T15:27:21+01:00
New Revision: 08742e72a34e835e6fc3c696eabe6045c78d6289

URL: https://github.com/llvm/llvm-project/commit/08742e72a34e835e6fc3c696eabe6045c78d6289
DIFF: https://github.com/llvm/llvm-project/commit/08742e72a34e835e6fc3c696eabe6045c78d6289.diff

LOG: compiler-rt/test/metadata: restrict tests to x86_64

aarch64 builder broke with:

-- Supported architectures for crt: aarch64
CMake Error at compiler-rt/cmake/config-ix.cmake:244 (message):
  Unsupported architecture: x86_64
Call Stack (most recent call first):
  compiler-rt/cmake/config-ix.cmake:280 (get_target_flags_for_arch)
  compiler-rt/test/metadata/CMakeLists.txt:7 (get_test_cc_for_arch)
-- Configuring incomplete, errors occurred!

https://lab.llvm.org/buildbot/#/builders/223/builds/11423

Restrict the tests to x86_64 only.

Reviewed By: melver

Differential Revision: https://reviews.llvm.org/D139323

Added: 
    

Modified: 
    compiler-rt/test/metadata/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/metadata/CMakeLists.txt b/compiler-rt/test/metadata/CMakeLists.txt
index b3765d7dd088..7f1befbbb8a4 100644
--- a/compiler-rt/test/metadata/CMakeLists.txt
+++ b/compiler-rt/test/metadata/CMakeLists.txt
@@ -1,15 +1,17 @@
-set(TEST_ARCH ${X86_64})
+if(CAN_TARGET_x86_64)
+  set(TEST_ARCH ${X86_64})
 
-set(METADATA_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(METADATA_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+  set(METADATA_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+  set(METADATA_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-set(SANITIZER_COMMON_TEST_TARGET_ARCH ${X86_64})
-get_test_cc_for_arch(${X86_64} METADATA_TEST_TARGET_CC METADATA_TEST_TARGET_CFLAGS)
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
+  set(SANITIZER_COMMON_TEST_TARGET_ARCH ${X86_64})
+  get_test_cc_for_arch(${X86_64} METADATA_TEST_TARGET_CC METADATA_TEST_TARGET_CFLAGS)
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+    ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
 
-add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS})
-set_target_properties(check-sanmd PROPERTIES FOLDER "Compiler-RT Misc")
+  add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests"
+    ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+  set_target_properties(check-sanmd PROPERTIES FOLDER "Compiler-RT Misc")
+endif()


        


More information about the llvm-commits mailing list