rocm-cmake: changed test API from old to new (#44939)

* rocm-cmake: changed test format from old to new
* Rename cmake variable
* post-conflict resolution: remove remaining version check

---------

Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
This commit is contained in:
AcriusWinter 2024-07-10 23:39:08 -07:00 committed by GitHub
parent 7c7ac27900
commit f9fa024fc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -63,12 +63,13 @@ def cache_test_sources(self):
install test subdirectory for use during `spack test run`.""" install test subdirectory for use during `spack test run`."""
self.cache_extra_test_sources([self.test_src_dir]) self.cache_extra_test_sources([self.test_src_dir])
def test(self): def test_cmake(self):
"""Test cmake"""
test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir) test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir)
with working_dir(test_dir, create=True): with working_dir(test_dir, create=True):
cmake_bin = join_path(self.spec["cmake"].prefix.bin, "cmake")
prefixes = ";".join([self.spec["rocm-cmake"].prefix]) prefixes = ";".join([self.spec["rocm-cmake"].prefix])
cc_options = ["-DCMAKE_PREFIX_PATH=" + prefixes, "."] cc_options = ["-DCMAKE_PREFIX_PATH=" + prefixes, "."]
self.run_test(cmake_bin, cc_options) cmake = which(self.spec["cmake"].prefix.bin.cmake)
cmake(*cc_options)
make() make()
make("clean") make("clean")