Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Jon Turney 2018-10-11 17:43:55 +01:00
parent 9717fb8164
commit efa55c9e1c
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/azure-steps.yml
View File

@ -39,6 +39,12 @@ steps:
Start-Process msiexec.exe -ArgumentList '/i msmpisdk.msi /quiet' -Wait Start-Process msiexec.exe -ArgumentList '/i msmpisdk.msi /quiet' -Wait
Start-Process .\MSMpiSetup.exe -ArgumentList '-unattend -full' -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 # add downloads to PATH
$env:Path = "$env:SYSTEM_WORKFOLDER;$env:Path" $env:Path = "$env:SYSTEM_WORKFOLDER;$env:Path"

4
test cases/frameworks/17 mpi/meson.build
View File

@ -44,4 +44,6 @@ if uburesult.returncode() != 0 and add_languages('fortran', required : false)
endif endif
# Check we can apply a version constraint # 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