From b526a902207c9e089269f51b68621c18312db8d0 Mon Sep 17 00:00:00 2001
From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com>
Date: Mon, 11 May 2020 18:27:38 -0500
Subject: Charm++: fix build prefix; add ucx/pmi support (#15666)

* Add pmi support (required by ucx, ofi, and gni backends)
* Add support for ucx backend
* Add dependency on MPI for pmi=simplepmi, slurmpmi, or slurmpmi2
* Remove charmpp as an MPI provider since the changes in this PR can
  add MPI as a dependency (mentioned previously)
* Install into transport_protocol-OS-arch subdirectory to match
  default charmpp installation behavior (which helps dependents find it)
---
 lib/spack/spack/test/cmd/providers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/test/cmd/providers.py b/lib/spack/spack/test/cmd/providers.py
index 3d537c553f..dd0c8a9eb7 100644
--- a/lib/spack/spack/test/cmd/providers.py
+++ b/lib/spack/spack/test/cmd/providers.py
@@ -22,8 +22,7 @@ def test_it_just_runs(pkg):
 
 
 @pytest.mark.parametrize('vpkg,provider_list', [
-    (('mpi',), ['charmpp@6.7.1:',
-                'intel-mpi',
+    (('mpi',), ['intel-mpi',
                 'intel-parallel-studio',
                 'mpich',
                 'mpich@1:',
-- 
cgit v1.2.3-60-g2f50