From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 23 May 2013 18:49:39 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0db09fe9eb8b03415a5dd00ff031f5a17096108;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: avoid few lingering $MAKE redirections
  tests: avoid '$MAKE' redirections, use 'run_make' instead
  tests: avoid use of redirected 'run_make' invocations
  lint: warn against redirected 'run_make' invocations
  comments: next GNU make release 4.0, not 3.83
  tests: fix a potential spurious failure due to global config.site
  HACKING: it's OK to do testsuite refactoring in a micro version

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

a0db09fe9eb8b03415a5dd00ff031f5a17096108
diff --cc t/fort2.sh
index bed032368,c2c0f0359..e5b6b76dc
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@@ -66,21 -66,10 +66,19 @@@ $AUTOCON
  touch hello.f90 foo.f95 sub/bar.f95 hi.f03 sub/howdy.f03 greets.f08 \
        sub/bonjour.f08 bye.f95 sub/baz.f90
  
- $MAKE -n \
+ run_make -O -- -n \
 -  FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08
 -# To make it easier to have  stricter grepping below.
 -sed -e 's/[ 	][ 	]*/  /g' -e 's/^/ /' -e 's/$/ /' stdout > out
 +  FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08 \
-   > stdout || { cat stdout; exit 1; }
- cat stdout
 +# To make it easier to have stricter grepping below.
 +$PERL -e '
 +  undef $/;
 +  $_ = <>;
 +  s/[^\\]\\\n/ /g;
 +  s/^/ /;
 +  s/\n/ \n /g;
 +  s/[ \t]+/  /g;
 +  s/\n\s*\z/\n/;
 +  print;
 +' <stdout >out
  cat out
  
  grep ' fake-fc .* --@90 .* hello\.f90 ' out