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/hdr-vars-defined-once.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/hdr-vars-defined-once.sh')
-rw-r--r-- | t/hdr-vars-defined-once.sh | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh index 85a254ae6..fdf0bb76d 100644 --- a/t/hdr-vars-defined-once.sh +++ b/t/hdr-vars-defined-once.sh @@ -25,25 +25,22 @@ END cat > Makefile.am << 'END' include Will_Be_Included_In_Makefile +test-distcommon: + echo ' ' $(DIST_COMMON) ' ' \ + | grep '[ /]Will_Be_Included_In_Makefile ' END -: > Will_Be_Included_In_Makefile +id=0c35bbde7c95b569a +echo "# $id" > Will_Be_Included_In_Makefile $ACLOCAL $AUTOMAKE test $(grep -c '^srcdir' Makefile.in) -eq 1 -# Also make sure include file is distributed. -sed -n -e '/^DIST_COMMON =.*\\$/ { - :loop - p - n - t clear - :clear - s/\\$/\\/ - t loop - p - n - }' -e '/^DIST_COMMON =/ p' Makefile.in | grep Will_Be_Included_In_Makefile +$AUTOCONF +./configure +$MAKE test-distcommon +$MAKE distdir +grep "$id" $distdir/Will_Be_Included_In_Makefile : |