diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2019-03-21 20:16:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2019-03-21 20:16:29 +0100 |
| commit | 4c1595d2367ddd184f135c717d8fb9ef1908428d (patch) | |
| tree | ffe7d021fce976b620e19c5bc6bb9ffa758be15b /gcc | |
| parent | bcb68daa54aeb40d2ec0d7c48633e2dc83870670 (diff) | |
| download | gcc-4c1595d2367ddd184f135c717d8fb9ef1908428d.zip gcc-4c1595d2367ddd184f135c717d8fb9ef1908428d.tar.gz gcc-4c1595d2367ddd184f135c717d8fb9ef1908428d.tar.bz2 | |
[testsuite, Fortran] Apply DejaGnu 1.4.4 work-around also to 'gfortran.dg/coarray/caf.exp:dg-compile-aux-modules'
See trunk r215293. This unifies all 'dg-compile-aux-modules' instances.
gcc/testsuite/
PR fortran/56408
* gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Workaround
missing nexted dg-test call support in dejaGNU 1.4.4.
From-SVN: r269848
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/coarray/caf.exp | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 914ba72..4044696 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2019-03-21 Thomas Schwinge <thomas@codesourcery.com> + PR fortran/56408 + * gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Workaround + missing nexted dg-test call support in dejaGNU 1.4.4. + PR fortran/29383 * gfortran.dg/ieee/ieee.exp (DEFAULT_FFLAGS): Set the same as in other '*.exp' files. diff --git a/gcc/testsuite/gfortran.dg/coarray/caf.exp b/gcc/testsuite/gfortran.dg/coarray/caf.exp index 4c6dba1..e3204c3 100644 --- a/gcc/testsuite/gfortran.dg/coarray/caf.exp +++ b/gcc/testsuite/gfortran.dg/coarray/caf.exp @@ -54,8 +54,18 @@ proc dg-compile-aux-modules { args } { error "dg-set-target-env-var: needs one argument" return } + + set level [info level] + if { [info procs dg-save-unknown] != [list] } { + rename dg-save-unknown dg-save-unknown-level-$level + } + dg-test $gfortran_test_path/[lindex $args 1] "" $gfortran_aux_module_flags - # cleanup-modules isn't intentionally invoked here. + # cleanup-modules is intentionally not invoked here. + + if { [info procs dg-save-unknown-level-$level] != [list] } { + rename dg-save-unknown-level-$level dg-save-unknown + } } # Add -latomic only where supported. Assume built-in support elsewhere. |