On Tue, Sep 16, 2014 at 09:31:04AM +0000, VandeVondele Joost wrote:
>
> > Does the following patch fix this? Works for me with dejagnu 1.5.1.
>
> and works for me with 1.4.4
Ok, I've committed this to trunk then, so that testing works again for those
with old dejagnu.
2014-09-16 Jakub Jelinek <ja...@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.
--- gcc/testsuite/gfortran.dg/dg.exp.jj 2014-09-15 21:45:45.000000000 +0200
+++ gcc/testsuite/gfortran.dg/dg.exp 2014-09-16 11:15:26.766004692 +0200
@@ -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.
Jakub
