From 22aada0e208c923ffab753a1ddd957c60dd82b7b Mon Sep 17 00:00:00 2001 From: Chris Green Date: Thu, 17 Nov 2022 09:54:46 -0600 Subject: Waf build system: fix typo in legacy_attributes (#33958) Fix erroneous duplication of `build_time_test_callbacks` in `legacy_attributes`: one of the duplicates should be `install_time_test_callbacks` --- lib/spack/spack/build_systems/waf.py | 2 +- var/spack/repos/builtin/packages/py-py2cairo/package.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py index f972d4e286..ad54b31dbb 100644 --- a/lib/spack/spack/build_systems/waf.py +++ b/lib/spack/spack/build_systems/waf.py @@ -72,9 +72,9 @@ class WafBuilder(BaseBuilder): #: Names associated with package attributes in the old build-system format legacy_attributes = ( - "build_time_test_callbacks", "build_time_test_callbacks", "build_directory", + "install_time_test_callbacks", ) # Callback names for build-time test diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index c54865d7d4..2f315d4023 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -23,8 +23,6 @@ class PyPy2cairo(WafPackage): depends_on("py-pytest", type="test") - @run_after("install") - @on_package_attributes(run_tests=True) def install_test(self): with working_dir("test"): pytest = which("py.test") -- cgit v1.2.3-60-g2f50