]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:49:39 +0000 (20:49 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:49:39 +0000 (20:49 +0200)
* 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>
1  2 
maintainer/syntax-checks.mk
t/aclocal-amflags.sh
t/cscope.tap
t/dist-missing-m4.sh
t/fort2.sh
t/silent-nested-vars.sh

Simple merge
Simple merge
diff --cc t/cscope.tap
Simple merge
Simple merge
diff --cc t/fort2.sh
index bed0323682e4104f92cc748ed860e41eab1a864d,c2c0f035969cf6b3bb58f1a2f7a8c730c3ba0b7b..e5b6b76dc436beba8b9eaa132bf24ccd8194a72e
@@@ -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
Simple merge