From d48f30057f50b69e3afff308c56836344c0f55d4 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 5 Sep 2017 20:46:38 -0400
Subject: [PATCH] Allow for adjusting line length of test backtraces

* test/Makefile.in (TEST_BACKTRACE_LINE_LENGTH): New option.
(%.log): Respect backtrace line length.
---
 test/Makefile.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index d4395e69bb8..e32920fb8b0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -97,6 +97,16 @@ TEST_LOCALE = C
 # this by default since it gives nicer stacktraces.
 TEST_LOAD_EL ?= yes
 
+# Maximum length of lines in ert backtraces; nil for no limit.
+# (if empty, use the default ert-batch-backtrace-right-margin).
+TEST_BACKTRACE_LINE_LENGTH =
+
+ifeq (${TEST_BACKTRACE_LINE_LENGTH},)
+ert_opts =
+else
+ert_opts = --eval '(setq ert-batch-backtrace-right-margin ${TEST_BACKTRACE_LINE_LENGTH})'
+endif
+
 ifeq (@HAVE_MODULES@, yes)
 MODULES_EMACSOPT := --module-assertions
 else
@@ -147,7 +157,8 @@ endif
 
 %.log: %.elc
 	$(AM_V_at)${MKDIR_P} $(dir $@)
-	$(AM_V_GEN)HOME=/nonexistent $(emacs) -l ert -l $(testloadfile) \
+	$(AM_V_GEN)HOME=/nonexistent $(emacs) \
+	  -l ert ${ert_opts} -l $(testloadfile) \
 	  --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
 
 ifeq (@HAVE_MODULES@, yes)
-- 
2.39.2