From 60132cdb8b0deb6b65cc5493bf53ba7398264f8c Mon Sep 17 00:00:00 2001 From: anush Date: Tue, 5 Mar 2024 19:57:29 +0000 Subject: [PATCH] Rename check target to rocm-cmake-check This is so that we can add_subdirectory() this project and not clash with LLVM's check target. TEST: running before and after has same number of check failures (3) on my system --- .travis.yml | 2 +- CMakeLists.txt | 2 +- appveyor.yml | 2 +- share/rocmcmakebuildtools/cmake/ROCMTest.cmake | 4 ++-- test/pass/simple-test.cmake | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08f53f51..5bd4076a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ script: - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX_PATH .. - - make check + - make rocm-cmake-check - make install - rm -rf "$INSTALL_PREFIX_PATH" diff --git a/CMakeLists.txt b/CMakeLists.txt index b5a38199..92b45f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,6 @@ add_custom_target(analyze COMMAND cmake-lint ${CMAKE_FILES} WORKING_DIRECTORY ${ add_custom_target(format COMMAND cmake-format -i ${CMAKE_FILES} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) enable_testing() -add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR}) +add_custom_target(rocm-cmake-check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR}) add_subdirectory(test) add_subdirectory(docs) diff --git a/appveyor.yml b/appveyor.yml index 1a2e20bf..85c5843a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ build_script: - cmd: mkdir build - cmd: cd build - cmd: cmake .. -G"%GENERATOR%" - - cmd: cmake --build . --config %CONFIG% --target check + - cmd: cmake --build . --config %CONFIG% --target rocm-cmake-check # test_script: # - cmd: ctest -C Debug --output-on-failure diff --git a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake index a6565e7c..73bc67ac 100644 --- a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake +++ b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake @@ -14,10 +14,10 @@ set(CTEST_PARALLEL_LEVEL set(CTEST_TIMEOUT 5000 CACHE STRING "CTest timeout") -add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C +add_custom_target(rocm-cmake-check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}) add_custom_target(tests COMMENT "Build all tests.") -add_dependencies(check tests) +add_dependencies(rocm-cmake-check tests) add_custom_target(install-tests COMMAND ${CMAKE_COMMAND} -DCOMPONENT=tests -P ${CMAKE_BINARY_DIR}/cmake_install.cmake) add_dependencies(install-tests tests) diff --git a/test/pass/simple-test.cmake b/test/pass/simple-test.cmake index 2d29dcc4..672720f9 100644 --- a/test/pass/simple-test.cmake +++ b/test/pass/simple-test.cmake @@ -2,6 +2,6 @@ # Copyright (C) 2023 Advanced Micro Devices, Inc. # ###################################################################################################################### -install_dir(${TEST_DIR}/libsimpletest TARGETS check install-tests) +install_dir(${TEST_DIR}/libsimpletest TARGETS rocm-cmake-check install-tests) test_expect_file(${PREFIX}/share/test/simple/CTestTestfile.cmake) test_exec(COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure WORKING_DIRECTORY ${PREFIX}/share/test/simple)