diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-17 01:37:26 -0500 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-17 10:56:09 -0500 |
| commit | a911a237ada423e272ca2a03cdc9f6aaf39821e5 (patch) | |
| tree | 666fa7dbe2efdd288b230030cdef40c77f61d996 /test cases | |
| parent | f6ad5d139869db1db130e675275d25fff08dc09f (diff) | |
| download | meson-a911a237ada423e272ca2a03cdc9f6aaf39821e5.zip meson-a911a237ada423e272ca2a03cdc9f6aaf39821e5.tar.gz meson-a911a237ada423e272ca2a03cdc9f6aaf39821e5.tar.bz2 | |
ci: add timeout to coarray test
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) |