From f9fa024fc5dda473d2c10e5c0aa3cc0a885e53f7 Mon Sep 17 00:00:00 2001 From: AcriusWinter <152348900+AcriusWinter@users.noreply.github.com> Date: Wed, 10 Jul 2024 23:39:08 -0700 Subject: 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> --- var/spack/repos/builtin/packages/rocm-cmake/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index bad78f50f4..dbb6c8f02b 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -63,12 +63,13 @@ class RocmCmake(CMakePackage): install test subdirectory for use during `spack test run`.""" 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) with working_dir(test_dir, create=True): - cmake_bin = join_path(self.spec["cmake"].prefix.bin, "cmake") prefixes = ";".join([self.spec["rocm-cmake"].prefix]) 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("clean") -- cgit v1.2.3-70-g09d2