Merge branch 'master' into ng/master

* master:
  tests: enhance coverage on silent-rules and C compilation rules a little
  tests: new variable $am_testaux_builddir
  tests: rename $am_testauxdir -> $am_testaux_srcdir

diff --cc t/ax/tap-summary-aux.sh
Simple merge

diff --cc t/ax/testsuite-summary-checks.sh
Simple merge

diff --cc t/distcheck-missing-m4.sh
Simple merge

diff --cc t/distcheck-outdated-m4.sh
Simple merge

diff --cc t/silent-c-generic.sh
index 74729e15f521e2df1fa0f727d9cb66f5bb1043e8,a241a6c28950d2147efa16f5e66cf9b69f8699d5..ac9dd72cfb6e86028adbc608603b94b3828b04f7
--- 1/t/silent-c-generic.sh
--- 2/t/silent-c-generic.sh
+++ b/t/silent-c-generic.sh
@@@ -45,25 -58,35 +45,34 @@@ $ACLOCA
  $AUTOMAKE --add-missing
  $AUTOCONF
  
- ./configure --enable-silent-rules
- $MAKE >stdout || { cat stdout; exit 1; }
- cat stdout
- $EGREP ' (-c|-o)|(mv|mkdir) '   stdout && exit 1
- grep ' CC  *foo\.o'             stdout
- grep ' CC  *bar-bar\.o'         stdout
- grep ' CC  *sub/baz\.o'         stdout
- grep ' CC  *sub/sub_bla-bla\.o' stdout
- grep ' CCLD  *foo'              stdout
- grep ' CCLD  *bar'              stdout
- grep ' CCLD  *sub/baz'          stdout
- grep ' CCLD  *sub/bla'          stdout
+ for config_args in \
+   '--enable-dependency-tracking' \
+   '--disable-dependency-tracking' \
+ ; do
  
- $MAKE clean
- $MAKE V=1 >stdout || { cat stdout; exit 1; }
- cat stdout
- grep ' -c' stdout
- grep ' -o foo' stdout
- grep ' -o sub/baz' stdout
- $EGREP '(CC|LD) ' stdout && exit 1
+   ./configure --enable-silent-rules $config_args
 -
+   $MAKE >stdout || { cat stdout; exit 1; }
+   cat stdout
 -  $EGREP ' (-c|-o)' stdout && exit 1
 -  grep 'mv ' stdout && exit 1
 -  grep 'CC .*foo\.' stdout
 -  grep 'CC .*bar\.' stdout
 -  grep 'CC .*baz\.' stdout
 -  grep 'CC .*bla\.' stdout
 -  grep 'CCLD .*foo' stdout
 -  grep 'CCLD .*bar' stdout
 -  grep 'CCLD .*baz' stdout
 -  grep 'CCLD .*bla' stdout
++  $EGREP ' (-c|-o)|(mv|mkdir) '   stdout && exit 1
++  grep ' CC  *foo\.o'             stdout
++  grep ' CC  *bar-bar\.o'         stdout
++  grep ' CC  *sub/baz\.o'         stdout
++  grep ' CC  *sub/sub_bla-bla\.o' stdout
++  grep ' CCLD  *foo'              stdout
++  grep ' CCLD  *bar'              stdout
++  grep ' CCLD  *sub/baz'          stdout
++  grep ' CCLD  *sub/bla'          stdout
+ 
+   $MAKE clean
+   $MAKE V=1 >stdout || { cat stdout; exit 1; }
+   cat stdout
+   grep ' -c' stdout
+   grep ' -o foo' stdout
++  grep ' -o sub/baz' stdout
+   $EGREP '(CC|LD) ' stdout && exit 1
+ 
+   $MAKE distclean
+ 
+ done
  
  :

diff --cc t/test-driver-acsubst.sh
Simple merge

diff --cc t/test-driver-cond.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck2.sh
Simple merge

diff --cc t/test-driver-custom-multitest.sh
Simple merge

diff --cc t/testsuite-summary-count-many.sh
index 1519c2831186ed21f17f599ef3ac82a52c9b1067,7fee21d905341410d11a5d94229e827d80894e99..0ee5d0ac8122d9e5a81a3c4642018f160a930d43
--- 1/t/testsuite-summary-count-many.sh
--- 2/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@@ -21,10 -21,8 +21,10 @@@
  
  . test-init.sh
  
 +expensive_
 +
  for s in trivial-test-driver extract-testsuite-summary.pl; do
-   cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
+   cp "$am_testaux_srcdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
  done
  
  br='============================================================================'