From 7bec524dd5b8055eab7bd06ac820c1df47bf6ddf Mon Sep 17 00:00:00 2001 From: AcriusWinter <152348900+AcriusWinter@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:01:06 -0700 Subject: [PATCH] Install test root update: old to new API (#45491) * convert install_test_root from old to new API --- var/spack/repos/builtin/packages/heffte/package.py | 2 +- var/spack/repos/builtin/packages/kokkos/package.py | 2 +- var/spack/repos/builtin/packages/py-chainer/package.py | 2 +- var/spack/repos/builtin/packages/tasmanian/package.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py index dc20db8a4fe40a..a397f95f740b8c 100644 --- a/var/spack/repos/builtin/packages/heffte/package.py +++ b/var/spack/repos/builtin/packages/heffte/package.py @@ -129,7 +129,7 @@ def setup_smoke_test(self): if self.spec.satisfies("@:2.2.0"): return install_tree( - self.prefix.share.heffte.testing, join_path(self.install_test_root, "testing") + self.prefix.share.heffte.testing, join_path(install_test_root(self), "testing") ) def test_make_test(self): diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 18ef8b9f01ac94..7dbfd79a1a6007 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -392,7 +392,7 @@ def setup_build_tests(self): cmake_source_path, "-DSPACK_PACKAGE_SOURCE_DIR:PATH={0}".format(self.stage.source_path), "-DSPACK_PACKAGE_TEST_ROOT_DIR:PATH={0}".format( - join_path(self.install_test_root, cmake_out_path) + join_path(install_test_root(self), cmake_out_path) ), "-DSPACK_PACKAGE_INSTALL_DIR:PATH={0}".format(self.prefix), ] diff --git a/var/spack/repos/builtin/packages/py-chainer/package.py b/var/spack/repos/builtin/packages/py-chainer/package.py index f284f2a054e330..77167c0b363ed0 100644 --- a/var/spack/repos/builtin/packages/py-chainer/package.py +++ b/var/spack/repos/builtin/packages/py-chainer/package.py @@ -59,7 +59,7 @@ def test_chainermn(self): if "+mn" not in self.spec: raise SkipTest("Test only supported when built with +mn") - mnist_file = join_path(self.install_test_root.examples.chainermn.mnist, "train_mnist.py") + mnist_file = join_path(install_test_root(self).examples.chainermn.mnist, "train_mnist.py") mpirun = which(self.spec["mpi"].prefix.bin.mpirun) opts = ["-n", "4", python.path, mnist_file, "-o", "."] env["OMP_NUM_THREADS"] = "4" diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index 6a43c5ee04f1f1..c858c6713e436e 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -122,7 +122,7 @@ def cmake_args(self): @run_after("install") def setup_smoke_test(self): install_tree( - self.prefix.share.Tasmanian.testing, join_path(self.install_test_root, "testing") + self.prefix.share.Tasmanian.testing, join_path(install_test_root(self), "testing") ) def test_make_test(self):