diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-11 17:43:55 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-14 16:01:36 +0100 |
| commit | efa55c9e1c19621290ddf226002feed9710185e8 (patch) | |
| tree | e8f5e139928c78795dde9f723a53813eddd1ae3a | |
| parent | 9717fb81646f0e6a17abd1a5e0ed8d3ccde64412 (diff) | |
| download | meson-efa55c9e1c19621290ddf226002feed9710185e8.zip meson-efa55c9e1c19621290ddf226002feed9710185e8.tar.gz meson-efa55c9e1c19621290ddf226002feed9710185e8.tar.bz2 | |
Set env vars so MS-MPI tests are run
Import MS-MPI env vars set by installer in registry to environment
Skip testing we can apply a version constraint to MPI when version isn't
known (as is the case for MS-MPI)
(These tests have never worked in appveyor)
| -rw-r--r-- | ci/azure-steps.yml | 6 | ||||
| -rw-r--r-- | test cases/frameworks/17 mpi/meson.build | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 984d05d..4cb6ac8 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -39,6 +39,12 @@ steps: Start-Process msiexec.exe -ArgumentList '/i msmpisdk.msi /quiet' -Wait Start-Process .\MSMpiSetup.exe -ArgumentList '-unattend -full' -Wait + # import ms-mpi env vars (set by installer) + foreach ($p in "MSMPI_INC", "MSMPI_LIB32", "MSMPI_LIB64") { + $v = [Environment]::GetEnvironmentVariable($p, "Machine") + Set-Content "env:$p" "$v" + } + # add downloads to PATH $env:Path = "$env:SYSTEM_WORKFOLDER;$env:Path" diff --git a/test cases/frameworks/17 mpi/meson.build b/test cases/frameworks/17 mpi/meson.build index b2f9fb8..ae3f08a 100644 --- a/test cases/frameworks/17 mpi/meson.build +++ b/test cases/frameworks/17 mpi/meson.build @@ -44,4 +44,6 @@ if uburesult.returncode() != 0 and add_languages('fortran', required : false) endif # Check we can apply a version constraint -dependency('mpi', version: '>=@0@'.format(mpic.version())) +if mpic.version() != 'unknown' + dependency('mpi', version: '>=@0@'.format(mpic.version())) +endif |