diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-18 23:40:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 23:40:12 +0200 |
| commit | b5f9895bfb3075296d38d048cf839fbb4afeb4c5 (patch) | |
| tree | cb9a86343064e3f4f7f748f5e4f5f2422ebb8941 /test cases | |
| parent | 050dcf80af99521ea8fee9dff0f71843a3e636f6 (diff) | |
| parent | cd08a9f7d8f3a67455780a592cb67974a8f35f25 (diff) | |
| download | meson-b5f9895bfb3075296d38d048cf839fbb4afeb4c5.zip meson-b5f9895bfb3075296d38d048cf839fbb4afeb4c5.tar.gz meson-b5f9895bfb3075296d38d048cf839fbb4afeb4c5.tar.bz2 | |
Merge pull request #6194 from scivision/coarrays
dep: Fortran Coarrays-enhance finding by use Pkg-config & CMake
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/fortran/13 coarray/meson.build | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test cases/fortran/13 coarray/meson.build b/test cases/fortran/13 coarray/meson.build index 23c7a55..29c8c13 100644 --- a/test cases/fortran/13 coarray/meson.build +++ b/test cases/fortran/13 coarray/meson.build @@ -2,10 +2,9 @@ project('Fortran coarray', 'fortran', meson_version: '>=0.50') fc = meson.get_compiler('fortran') -fcid = fc.get_id() -if ['pgi', 'flang'].contains(fcid) - error('MESON_SKIP_TEST: At least through PGI 19.4 and Flang 7.1 do not support Fortran Coarrays.') +if ['pgi', 'flang'].contains(fc.get_id()) + error('MESON_SKIP_TEST: At least through PGI 19.10 and Flang 7.1 do not support Fortran Coarrays.') endif # coarray is required because single-image fallback is an intrinsic feature @@ -15,12 +14,11 @@ coarray = dependency('coarray') # for example, conflicting library/compiler versions on PATH # this has to invoke a run of "sync all" to verify the MPI stack is functioning, # particularly for dynamic linking -coarray_ok = fc.run('sync all; end', dependencies: coarray, name: 'Coarray link & run').returncode() == 0 -if not coarray_ok - error('MESON_SKIP_TEST: The coarray stack (including MPI) did not link correctly so that a simple test could run.') +if fc.run('sync all; end', dependencies: coarray, name: 'Coarray link & run').returncode() != 0 + error('The coarray stack (including MPI) did not link correctly so that a simple test could run.') endif exe = executable('hello', 'main.f90', dependencies : coarray) -test('Coarray hello world', exe) +test('Coarray hello world', exe, timeout: 10) |