diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-13 04:55:43 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-13 04:55:43 +0000 |
| commit | 3b257773a55b3d58e8a41d82203bb5a66304f3fe (patch) | |
| tree | 1252fb70e34b25c00144d093927bed3f745f4316 | |
| parent | 3d5be5f86a900aa9347db8643bacdaebd38ae241 (diff) | |
.travis.yml: specify --tty=no
To reduce the amount of output, prefer --tty=no instead of
--color=never. This option not only disables color output but also
kill some tty-related features, like spinners. Travis limits its
output by the physical size of the log, not by the number of lines.
This change should make more room for new logs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | tool/m4/_colorize_result_prepare.m4 | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 3fe9a18021..eac71c1f72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,9 @@ addons: - libffi - openssl@1.1 - zlib - +env: + global: + - "CONFIGURE_TTY=no" .org.ruby-lang.ci.matrix-definitions: - &cron-only @@ -304,9 +306,8 @@ before_script: - "$SETARCH make -s $JOBS && make install" script: - - "$SETARCH make -s test TESTOPTS=--color=never" - - "export TEST_ALL_TESTOPTS=\"${TEST_ALL_TESTOPTS:- $JOBS -q --color=never --job-status=normal}\"" - - "$SETARCH make -s test-all -o exts TESTOPTS=\"$TEST_ALL_TESTOPTS\"" + - "$SETARCH make -s test TESTOPTS=\"${TESTOPTS=$JOBS -q --tty=no}\"" + - "$SETARCH make -s test-all -o exts TESTOPTS=\"${TEST_ALL_OPTS=$TESTOPTS}\"" - "$SETARCH make -s test-spec MSPECOPT=-ff" # not using `-j` because sometimes `mspec -j` silently dies # Branch matrix. Not all branches are Travis-ready so we limit branches here. diff --git a/Makefile.in b/Makefile.in index c2b2c509fb..ae00865de3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -340,7 +340,7 @@ uncommon.mk: $(srcdir)/common.mk .PHONY: reconfig reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args) config.status-args = ./config.status --recheck -reconfig-exec-0 = test -t 1 && { CONFIGURE_TTY=yes; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-` +reconfig-exec-0 = test -t 1 && { CONFIGURE_TTY=${CONFIGURE_TTY=yes}; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-` reconfig-exec-1 = set -x; "$$@" reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ diff --git a/tool/m4/_colorize_result_prepare.m4 b/tool/m4/_colorize_result_prepare.m4 index 292155f113..af572caa18 100644 --- a/tool/m4/_colorize_result_prepare.m4 +++ b/tool/m4/_colorize_result_prepare.m4 @@ -1,7 +1,13 @@ # -*- Autoconf -*- AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= - AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [ + AS_CASE(["x${CONFIGURE_TTY}"], + [xyes|xalways],[rb_cv_configure_tty=1], + [xno|xnever], [rb_cv_configure_tty=0], + [AS_IF([test -t 1], + [rb_cv_configure_tty=1], + [rb_cv_configure_tty=0])]) + AS_IF([test $rb_cv_configure_tty -eq 1], [ msg_begin="`tput smso 2>/dev/null`" AS_CASE(["$msg_begin"], ['@<:@'*m], [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`" |