diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-09-16 11:35:00 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-09-16 11:35:00 +0200 |
| commit | 7c943bd87c364895f3a49f6e90fd9c366a3ff945 (patch) | |
| tree | 62f276ef57e80f980da4f30cb82ecd87b8c326ce | |
| parent | 9994ad20a13463bf79f22f439a072df3de23f238 (diff) | |
| download | gcc-7c943bd87c364895f3a49f6e90fd9c366a3ff945.zip gcc-7c943bd87c364895f3a49f6e90fd9c366a3ff945.tar.gz gcc-7c943bd87c364895f3a49f6e90fd9c366a3ff945.tar.bz2 | |
re PR fortran/56408 (Fix dependency handling of testsuite/gfortran.dg)
PR fortran/56408
* gfortran.dg/dg.exp (dg-compile-aux-modules): Workaround
missing nexted dg-test call support in dejaGNU 1.4.4.
From-SVN: r215293
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dg.exp | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fdb706a..4d3c96b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-09-16 Jakub Jelinek <jakub@redhat.com> + + PR fortran/56408 + * gfortran.dg/dg.exp (dg-compile-aux-modules): Workaround + missing nexted dg-test call support in dejaGNU 1.4.4. + 2014-09-15 Andi Kleen <ak@linux.intel.com> * gcc.dg/pg-override.c: New test. diff --git a/gcc/testsuite/gfortran.dg/dg.exp b/gcc/testsuite/gfortran.dg/dg.exp index e8c3923..6bd69e6 100644 --- a/gcc/testsuite/gfortran.dg/dg.exp +++ b/gcc/testsuite/gfortran.dg/dg.exp @@ -39,8 +39,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 + } } # Main loop. |