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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fdb706a8d8dd3b54f02f91060268f31aeac518e5..4d3c96beee2c150630c48183a999accdcb10aef5 100644 (file)
--- 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 e8c39231db00d17a26e505fcf3d811d37b6b4b9d..6bd69e6c88d01a64bc05c922af3eb63229fe4549 100644 (file)
--- 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.