summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2014-10-27 20:02:24 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2014-10-27 20:02:24 -0700
commit1c4948e1b0cbcaa6d367152e21c6df7d53ebb945 (patch)
tree4c901637bb982f3540e0e63c2b146df0c5648dd9
parentd98beeec31ad218c5b807774d42a447199005512 (diff)
downloadspack-1c4948e1b0cbcaa6d367152e21c6df7d53ebb945.tar.gz
spack-1c4948e1b0cbcaa6d367152e21c6df7d53ebb945.tar.bz2
spack-1c4948e1b0cbcaa6d367152e21c6df7d53ebb945.tar.xz
spack-1c4948e1b0cbcaa6d367152e21c6df7d53ebb945.zip
Fix long-standing multimethod test error.
- New inclusive version ranges from git-fetching branch enable a fix. - Can now write :1 to include 1.3, 1.4, etc. - couldn't do this before so provides() was weird.
-rw-r--r--lib/spack/spack/test/multimethod.py8
-rw-r--r--var/spack/mock_packages/mpich/package.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py
index d773113426..cd5d9e625e 100644
--- a/lib/spack/spack/test/multimethod.py
+++ b/lib/spack/spack/test/multimethod.py
@@ -73,11 +73,11 @@ class MultiMethodTest(MockPackagesTest):
def test_undefined_mpi_version(self):
- # This currently fails because provides() doesn't do
- # the right thing undefined version ranges.
- # TODO: fix this.
pkg = spack.db.get('multimethod^mpich@0.4')
- self.assertEqual(pkg.mpi_version(), 0)
+ self.assertEqual(pkg.mpi_version(), 1)
+
+ pkg = spack.db.get('multimethod^mpich@1.4')
+ self.assertEqual(pkg.mpi_version(), 1)
def test_default_works(self):
diff --git a/var/spack/mock_packages/mpich/package.py b/var/spack/mock_packages/mpich/package.py
index e86c1a68ac..75a939a892 100644
--- a/var/spack/mock_packages/mpich/package.py
+++ b/var/spack/mock_packages/mpich/package.py
@@ -37,7 +37,7 @@ class Mpich(Package):
version('3.0', 'foobarbaz')
provides('mpi@:3', when='@3:')
- provides('mpi@:1', when='@1:')
+ provides('mpi@:1', when='@:1')
def install(self, spec, prefix):
pass