diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-22 17:56:22 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-22 17:56:22 +0100 |
| commit | 88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550 (patch) | |
| tree | 16c1527969be06b21275e997f559333b738c8be5 /t/distcom3.sh | |
| parent | 4179284a3de093f3578a67c9b258a0d91eb4b6be (diff) | |
| parent | 912383451a4a394383a8e95240e3e98ee68faf72 (diff) | |
| download | automake-88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550.tar.gz | |
Merge branch 'micro' into minor
* micro:
cleanup: refactor code to initialize DIST_COMMON
dist: ordering of files in DIST_COMMON is deterministic now
tests: refactor some tests on DIST_COMMON
maint: make output of 'gen-testsuite-part' deterministic
When computing lispdir, don't load emacs site wide init file.
PATH: quote $(PATH_SEPARATOR) as well
Improve detection of GNU make, avoiding "Arg list too long" errors.
Diffstat (limited to 't/distcom3.sh')
| -rw-r--r-- | t/distcom3.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/t/distcom3.sh b/t/distcom3.sh index 78379594d..6f1ebaf3a 100644 --- a/t/distcom3.sh +++ b/t/distcom3.sh @@ -19,9 +19,13 @@ . test-init.sh +echo AC_OUTPUT >> configure.ac + cat > Makefile.am << 'END' README: echo 'I bet you are reading me.' > README +test-distcommon: + echo ' ' $(DIST_COMMON) ' ' | grep ' README ' END # Files required by '--gnu'. @@ -36,20 +40,14 @@ $AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output; exit 1; } cat output grep README output && exit 1 -sed -n -e '/^DIST_COMMON =.*\\$/ { - :loop - p - n - t clear - :clear - s/\\$/\\/ - t loop - p - n - }' -e '/^DIST_COMMON =/ p' Makefile.in | grep README - +$AUTOCONF +./configure +$MAKE test-distcommon +$MAKE distdir +test -f $distdir/README # Should warn about missing README. +rm -f README : > Makefile.am AUTOMAKE_fails --add-missing --gnu grep 'required file.*README.*not found' stderr |