Re: [PATCH] gfortran testsuite: implicitly cleanup-modules

[Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]

On Thu, Mar 15, 2012 at 08:35:47PM +0100, Jakub Jelinek wrote:
>On Thu, Mar 15, 2012 at 05:56:32PM +0100, Bernhard Reutner-Fischer wrote:
>> On Thu, Mar 15, 2012 at 04:57:12PM +0100, Richard Guenther wrote:
>> >On Thu, Mar 15, 2012 at 1:39 PM, Bernhard Reutner-Fischer
>> ><rep.dot.nop@gmail.com> wrote:
>> 
>> >> committed as r185430.
>> >
>> >You forgot to add fortran-modules.exp :(
>> 
>> committed as r185439.
>> I am very sorry for that..
>
>Even with that file in, libgomp and libitm make check still fail,
>can't find fortran-modules.exp.

I have committed the attached as r185460.

The underlying problem is that dejagnu's runtest.exp only allows for a
single "libdir" where it searches for includes -- see comment in
libgomp.exp and libitm.exp

While just adding more and more load_gcc_lib calls to users outside of
gcc/ is the easy way out, it is (IMHO) error prone (i ran make check
just in gcc and not in toplevel, fixed my script now).

It would be desirable if dejagnu would just find all the currently
load_gcc_lib'ed files on its own, via load_lib.
One could
- teach dejagnu to treat libdir as a list of paths
- symlink gcc/testsuite/lib/* into */testsuite/config (ugly)

for reference, dejagnu's load_lib currently searches in
../lib $libdir $libdir/lib [file dirname [file dirname $srcdir]]/dejagnu/lib $srcdir/lib $execpath/lib . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/lib

[-- Attachment #2: testsuite-fixup.r185460.patch --]
[-- Type: text/x-diff, Size: 1643 bytes --]

Index: libitm/ChangeLog
===================================================================
--- libitm/ChangeLog	(revision 185459)
+++ libitm/ChangeLog	(revision 185460)
@@ -1,3 +1,7 @@
+2012-03-16  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+	* testsuite/lib/libitm.exp: load fortran-modules.exp
+
 2012-03-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* configure.tgt (*-*-irix6*): Remove.
Index: libitm/testsuite/lib/libitm.exp
===================================================================
--- libitm/testsuite/lib/libitm.exp	(revision 185459)
+++ libitm/testsuite/lib/libitm.exp	(revision 185460)
@@ -38,6 +38,7 @@
 load_gcc_lib torture-options.exp
 load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
+load_gcc_lib fortran-modules.exp
 load_gcc_lib gcc-dg.exp
 
 set dg-do-what-default run
Index: libgomp/ChangeLog
===================================================================
--- libgomp/ChangeLog	(revision 185459)
+++ libgomp/ChangeLog	(revision 185460)
@@ -1,3 +1,7 @@
+2012-03-16  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+	* testsuite/lib/libgomp.exp: load fortran-modules.exp
+
 2012-03-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* configure.tgt (mips-sgi-irix6*): Remove.
Index: libgomp/testsuite/lib/libgomp.exp
===================================================================
--- libgomp/testsuite/lib/libgomp.exp	(revision 185459)
+++ libgomp/testsuite/lib/libgomp.exp	(revision 185460)
@@ -24,6 +24,7 @@
 load_gcc_lib torture-options.exp
 load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
+load_gcc_lib fortran-modules.exp
 load_gcc_lib gcc-dg.exp
 load_gcc_lib gfortran-dg.exp