aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPaul Eggert2016-11-20 16:57:17 -0800
committerPaul Eggert2016-11-20 16:59:24 -0800
commit0b187fd2bfb797e113626df1b3740edbda8b698a (patch)
treebb0d96996a2058c644d829350cafe61263f3c51a /test
parentebe2e69c8fb14dfa169e0497cd868ade79d4c9d8 (diff)
downloademacs-0b187fd2bfb797e113626df1b3740edbda8b698a.tar.gz
emacs-0b187fd2bfb797e113626df1b3740edbda8b698a.zip
Make CANNOT_DUMP work better on GNU/Linux
Clean up some of the bitrot affecting the CANNOT_DUMP code. This lets the build succeed again, and fixes the testing framework so that most test cases now pass. About twenty test cases still fail, though, and we still have Bug#24974. * configure.ac (CANNOT_DUMP): Now empty if CANNOT_DUMP. (SYSTEM_MALLOC): Now true if CANNOT_DUMP. There should no longer be any point to messing with a private memory allocator unless Emacs is dumping. * src/alloc.c (alloc_unexec_pre, alloc_unexec_post, check_pure_size): * src/image.c (reset_image_types): * src/lastfile.c (my_endbss, _my_endbss, my_endbss_static): Do not define if CANNOT_DUMP. * src/emacs.c (might_dump) [CANNOT_DUMP]: Now always false and local. (daemon_pipe) [!WINDOWSNT]: Now static. * test/Makefile.in (mostlyclean): Remove *.tmp files. (make-test-deps.mk): Elide CANNOT_DUMP chatter.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 33e625fc996..f2f27634c24 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -190,6 +190,7 @@ check-doit: ${LOGFILES}
190 190
191mostlyclean: 191mostlyclean:
192 -@for f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done 192 -@for f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done
193 rm -f *.tmp
193 194
194clean: 195clean:
195 -rm -f ${LOGFILES} ${LOGSAVEFILES} 196 -rm -f ${LOGFILES} ${LOGSAVEFILES}
@@ -206,5 +207,7 @@ maintainer-clean: distclean bootstrap-clean
206make-test-deps.mk: $(ELFILES) make-test-deps.emacs-lisp 207make-test-deps.mk: $(ELFILES) make-test-deps.emacs-lisp
207 $(EMACS) --batch -l $(srcdir)/make-test-deps.emacs-lisp \ 208 $(EMACS) --batch -l $(srcdir)/make-test-deps.emacs-lisp \
208 --eval "(make-test-deps \"$(srcdir)\")" \ 209 --eval "(make-test-deps \"$(srcdir)\")" \
209 2> $@ 210 2> $@.tmp
210# Makefile ends here. 211 # Hack to elide any CANNOT_DUMP=yes chatter.
212 sed '/\.log: /!d' $@.tmp >$@
213 rm -f $@.tmp