diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | tests/scripts/misc/fopen-fail | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index d2451b88..958f37b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,8 +126,8 @@ guile.$(OBJEXT): gmk-default.h gmk-default.h: $(srcdir)/gmk-default.scm (echo 'static const char *const GUILE_module_defn = " '\\ \ && sed -e 's/;.*//' -e '/^[ \t]*$$/d' -e 's/"/\\"/g' -e 's/$$/ \\/' \ - $(srcdir)/gmk-default.scm \ - && echo '";') > $@ + $(srcdir)/gmk-default.scm \ + && echo '";') > $@ # --------------- Local DIST Section @@ -175,6 +175,7 @@ MAKETESTFLAGS = check-regression: tests/config-flags.pm @if test -f '$(srcdir)/tests/run_make_tests'; then \ + ulimit -n 128; \ if $(PERL) -v >/dev/null 2>&1; then \ case `cd '$(srcdir)'; pwd` in `pwd`) : ;; \ *) test -d tests || mkdir tests; \ @@ -189,9 +190,9 @@ check-regression: tests/config-flags.pm else \ echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \ fi; \ - else \ + else \ echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \ - fi + fi # --------------- Maintainer's Section diff --git a/tests/scripts/misc/fopen-fail b/tests/scripts/misc/fopen-fail index 6580e519..2ec9810b 100644 --- a/tests/scripts/misc/fopen-fail +++ b/tests/scripts/misc/fopen-fail @@ -7,9 +7,12 @@ $description = "Make sure make exits with an error if fopen fails."; # since it's hard to know what it will be, exactly. # See Savannah bug #27374. +# Use a longer-than-normal timeout: some systems have more FDs available? +# We also set ulimit -n 512 in check-regression in Makefile.am, which see. +# See Savannah bug #42390. run_make_test(q! include $(lastword $(MAKEFILE_LIST)) !, - '', undef, 512); + '', undef, 512, 300); 1; |