azure: Fix some places where an unexpected compiler is being picked up

Now we have some information in CI logs about what compiler is actually
being used, fix some places where an unexpected compiler is being picked
up.

Avoid picking up gcc-objc and gfortran from PATH in vs2017 image for VS
test runs.

Use clang for objc/objc++ in MSYS2 clang test runs, rather than picking
up gcc from path.

Also install gfortran for fortran tests on Cygwin.
pull/5250/head
Jon Turney 6 years ago
parent 10749494c8
commit df0be82dd6
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
  1. 3
      azure-pipelines.yml
  2. 4
      ci/azure-steps.yml

@ -73,6 +73,7 @@ jobs:
- script: | - script: |
%CYGWIN_ROOT%\cygwinsetup.exe -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -g -P ^ %CYGWIN_ROOT%\cygwinsetup.exe -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -g -P ^
cmake,^ cmake,^
gcc-fortran,^
gcc-objc++,^ gcc-objc++,^
gcc-objc,^ gcc-objc,^
git,^ git,^
@ -154,7 +155,7 @@ jobs:
set BOOST_ROOT= set BOOST_ROOT=
set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
set PATHEXT=%PATHEXT%;.py set PATHEXT=%PATHEXT%;.py
if %compiler%==clang ( set CC=clang && set CXX=clang++ ) if %compiler%==clang ( set CC=clang && set CXX=clang++ && set OBJC=clang && set OBJCXX=clang++ )
%MSYS2_ROOT%\usr\bin\bash -lc "MSYSTEM= python3 run_tests.py --backend=ninja" %MSYS2_ROOT%\usr\bin\bash -lc "MSYSTEM= python3 run_tests.py --backend=ninja"
env: env:
CHERE_INVOKING: yes CHERE_INVOKING: yes

@ -5,8 +5,8 @@ steps:
exit 0 exit 0
} }
# remove MinGW from path, so we don't find gfortran and try to use it # remove Chocolately, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it
$env:Path = ($env:Path.Split(';') | Where-Object { $_ -notlike '*mingw*' }) -join ';' $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey' }) -join ';'
# download and install prerequisites # download and install prerequisites
function DownloadFile([String] $Source, [String] $Destination) { function DownloadFile([String] $Source, [String] $Destination) {

Loading…
Cancel
Save