From ca550cd819ca84097eb44933a851abb91499a267 Mon Sep 17 00:00:00 2001 From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> Date: Thu, 1 Jul 2021 00:17:38 -0700 Subject: hdf: replacing use of install test root with new cached tests dir (#24368) --- var/spack/repos/builtin/packages/hdf/package.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index d12aa812fd..da812fb6b4 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -163,6 +163,12 @@ class Hdf(AutotoolsPackage): extra_install_tests = 'hdf/util/testfiles' + @property + def cached_tests_work_dir(self): + """The working directory for cached test sources.""" + return join_path(self.test_suite.current_test_cache_dir, + self.extra_install_tests) + @run_after('install') def setup_build_tests(self): """Copy the build test files after the package is installed to an @@ -183,8 +189,8 @@ class Hdf(AutotoolsPackage): def _test_gif_converters(self): """This test performs an image conversion sequence and diff.""" work_dir = '.' - storm_fn = os.path.join(self.install_test_root, - self.extra_install_tests, 'storm110.hdf') + storm_fn = os.path.join(self.cached_tests_work_dir, 'storm110.hdf') + gif_fn = 'storm110.gif' new_hdf_fn = 'storm110gif.hdf' @@ -203,8 +209,8 @@ class Hdf(AutotoolsPackage): def _test_list(self): """This test compares low-level HDF file information to expected.""" - storm_fn = os.path.join(self.install_test_root, - self.extra_install_tests, 'storm110.hdf') + storm_fn = os.path.join(self.cached_tests_work_dir, + 'storm110.hdf') test_data_dir = self.test_suite.current_test_data_dir work_dir = '.' -- cgit v1.2.3-60-g2f50