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/distcom4.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/distcom4.sh')
-rw-r--r-- | t/distcom4.sh | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/t/distcom4.sh b/t/distcom4.sh index 5feae9b96..39b5b7179 100644 --- a/t/distcom4.sh +++ b/t/distcom4.sh @@ -43,8 +43,13 @@ mkdir tests : > README : > tests/wrapper.in cat > Makefile.am << 'END' -.PHONY: test -test: distdir +.PHONY: test1 test 2 +test1: + for x in $(DIST_COMMON); do echo $$x; done \ + | grep 'tests/' > lst + cat lst # For debugging. + test `wc -l <lst` -eq 1 +test2: distdir test -f $(distdir)/tests/wrapper.in END @@ -52,23 +57,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing ./configure -$MAKE test - -sed -n -e '/^DIST_COMMON =.*\\$/ { - :loop - p - n - t clear - :clear - s/\\$/\\/ - t loop - p - n - }' -e '/^DIST_COMMON =/ p' Makefile.in > dc.txt - -cat dc.txt # For debugging. - -test 1 -eq $(grep -c tests dc.txt) -grep configure dc.txt +$MAKE test1 test2 : |