github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-29 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

* tests/scripts/misc/fopen-fail: [SV 42390] Increase test timeout.

Browse Source 
* Makefile.am (check-regression): Force ulimit -n for fopen-fail test.
This commit is contained in:
Paul Smith 2015-07-12 18:05:50 -04:00
parent fe5585528f
commit c18b23f7b2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -126,8 +126,8 @@ guile.$(OBJEXT): gmk-default.h
gmk-default.h: $(srcdir)/gmk-default.scm gmk-default.h: $(srcdir)/gmk-default.scm
(echo 'static const char *const GUILE_module_defn = " '\\ \ (echo 'static const char *const GUILE_module_defn = " '\\ \
&& sed -e 's/;.*//' -e '/^[ \t]*$$/d' -e 's/"/\\"/g' -e 's/$$/ \\/' \ && sed -e 's/;.*//' -e '/^[ \t]*$$/d' -e 's/"/\\"/g' -e 's/$$/ \\/' \
$(srcdir)/gmk-default.scm \ $(srcdir)/gmk-default.scm \
&& echo '";') > $@ && echo '";') > $@
# --------------- Local DIST Section # --------------- Local DIST Section
@ -175,6 +175,7 @@ MAKETESTFLAGS =
check-regression: tests/config-flags.pm check-regression: tests/config-flags.pm
@if test -f '$(srcdir)/tests/run_make_tests'; then \ @if test -f '$(srcdir)/tests/run_make_tests'; then \
ulimit -n 128; \
if $(PERL) -v >/dev/null 2>&1; then \ if $(PERL) -v >/dev/null 2>&1; then \
case `cd '$(srcdir)'; pwd` in `pwd`) : ;; \ case `cd '$(srcdir)'; pwd` in `pwd`) : ;; \
*) test -d tests || mkdir tests; \ *) test -d tests || mkdir tests; \
@ -189,9 +190,9 @@ check-regression: tests/config-flags.pm
else \ else \
echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \ echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \
fi; \ fi; \
else \ else \
echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \ echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \
fi fi
# --------------- Maintainer's Section # --------------- Maintainer's Section

5
tests/scripts/misc/fopen-fail
View File

@ -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. # since it's hard to know what it will be, exactly.
# See Savannah bug #27374. # 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! run_make_test(q!
include $(lastword $(MAKEFILE_LIST)) include $(lastword $(MAKEFILE_LIST))
!, !,
'', undef, 512); '', undef, 512, 300);
1; 1;