Disable mixed (mscv/clang + gnu) Windows Fortran tests. Closes #4829.

pull/4834/head
Jussi Pakkanen 6 years ago
parent 8636f31d9c
commit 3997649139
  1. 12
      test cases/common/190 openmp/meson.build
  2. 6
      test cases/fortran/9 cpp/meson.build
  3. 12
      test cases/frameworks/17 mpi/meson.build

@ -38,11 +38,13 @@ test('OpenMP C++', execpp, env : env)
if add_languages('fortran', required : false)
exef = executable('exef',
'main.f90',
dependencies : [openmp])
test('OpenMP Fortran', execpp, env : env)
# Mixing compilers (msvc/clang with gfortran) does not seem to work on Windows.
if build_machine.system() != 'windows' or cc.get_id() == 'gnu'
exef = executable('exef',
'main.f90',
dependencies : [openmp])
test('OpenMP Fortran', execpp, env : env)
endif
endif
# Check we can apply a version constraint

@ -1,12 +1,16 @@
project('C++ and FORTRAN', 'cpp', 'fortran')
cpp = meson.get_compiler('cpp')
fc = meson.get_compiler('fortran')
if cpp.get_id() == 'clang'
error('MESON_SKIP_TEST Clang C++ does not find -lgfortran for some reason.')
endif
fc = meson.get_compiler('fortran')
if build_machine.system() == 'windows' and cpp.get_id() != 'gnu'
error('MESON_SKIP_TEST mixing gfortran with non-GNU C++ does not work.')
endif
link_with = []
if fc.get_id() == 'intel'
link_with += fc.find_library('ifport')

@ -36,11 +36,13 @@ uburesult = run_command(ubudetector)
if uburesult.returncode() != 0 and add_languages('fortran', required : false)
mpifort = dependency('mpi', language : 'fortran')
exef = executable('exef',
'main.f90',
dependencies : [mpifort])
test('MPI Fortran', exef)
# Mixing compilers (msvc/clang with gfortran) does not seem to work on Windows.
if build_machine.system() != 'windows' or cc.get_id() == 'gnu'
exef = executable('exef',
'main.f90',
dependencies : [mpifort])
test('MPI Fortran', exef)
endif
endif
# Check we can apply a version constraint

Loading…
Cancel
Save