diff options
| author | Eric Blake <ebb9@byu.net> | 2008-05-27 10:57:01 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-05-27 10:57:01 -0600 |
| commit | a858ceb9ba54912fce6ab53706c719385e41f415 (patch) | |
| tree | 9da15cd6699b774f199f0ec74675c5abefcd2487 | |
| parent | cee1cf959014278f8efaf02c251c69b8ad577747 (diff) | |
| download | m4-a858ceb9ba54912fce6ab53706c719385e41f415.tar.gz | |
Support 'make dist' with BSD make.
* Makefile.am (TESTSUITE_AT, MAINTAINERCLEANFILES): Qualify uses
of the generated file tests/generated.at.
(EXTRA_DIST, $(TESTSUITE)): Likewise for tests/package.m4.
* tests/others.at (stdout closed): Accomodate OpenBSD /bin/sh.
Signed-off-by: Eric Blake <ebb9@byu.net>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | tests/others.at | 2 |
3 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2008-05-27 Eric Blake <ebb9@byu.net> + + Support 'make dist' with BSD make. + * Makefile.am (TESTSUITE_AT, MAINTAINERCLEANFILES): Qualify uses + of the generated file tests/generated.at. + (EXTRA_DIST, $(TESTSUITE)): Likewise for tests/package.m4. + * tests/others.at (stdout closed): Accomodate OpenBSD /bin/sh. + 2008-05-24 Eric Blake <ebb9@byu.net> Test NUL in frozen files. diff --git a/Makefile.am b/Makefile.am index 76068021..1548051d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -359,7 +359,7 @@ TESTSUITE = $(srcdir)/tests/testsuite TESTSUITE_AT = \ tests/builtins.at \ tests/freeze.at \ - tests/generated.at \ + $(srcdir)/tests/generated.at \ tests/macros.at \ tests/modules.at \ tests/options.at \ @@ -369,7 +369,7 @@ TESTSUITE_AT = \ EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) $(OTHER_FILES) \ tests/atlocal.in \ tests/generate.awk \ - tests/package.m4 + $(srcdir)/tests/package.m4 # Be sure to reexport important environment variables: TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ @@ -391,7 +391,7 @@ $(srcdir)/tests/generated.at: tests/generate.awk $(m4_texinfo) AUTOM4TE = autom4te AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT) +$(TESTSUITE): $(srcdir)/tests/package.m4 $(TESTSUITE_AT) $(AUTOTEST) -I '$(srcdir)/tests' -o $@.tmp $@.at mv $@.tmp $@ @@ -436,6 +436,6 @@ OTHER_FILES = tests/iso8859.m4 tests/stackovf.test \ tests/null.m4 tests/null.out tests/null.err DISTCLEANFILES += tests/atconfig tests/atlocal tests/m4 -MAINTAINERCLEANFILES += tests/generated.at '$(TESTSUITE)' +MAINTAINERCLEANFILES += $(srcdir)/tests/generated.at '$(TESTSUITE)' clean-local: clean-local-tests diff --git a/tests/others.at b/tests/others.at index 68d58a39..54241310 100644 --- a/tests/others.at +++ b/tests/others.at @@ -704,7 +704,7 @@ AT_DATA([in.m4], [[syscmd(`cat <&1 >&2')dnl dnl this line should not be read by cat ]]) AT_CHECK_M4([in.m4 >&-], [0], [], [stderr]) -AT_CHECK([sed -e 's/.*\(Bad file descriptor\)$/\1/' stderr], [0], +AT_CHECK([[sed -e 's/.*[Bb]\(ad file descriptor\)$/B\1/' stderr]], [0], [[Bad file descriptor ]]) |