shyouhei	2018-11-13 13:55:43 +0900 (Tue, 13 Nov 2018)

  New Revision: 65702

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65702

  Log:
    .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.

  Modified files:
    trunk/.travis.yml
    trunk/Makefile.in
    trunk/tool/m4/_colorize_result_prepare.m4
Index: tool/m4/_colorize_result_prepare.m4
===================================================================
--- tool/m4/_colorize_result_prepare.m4	(revision 65701)
+++ tool/m4/_colorize_result_prepare.m4	(revision 65702)
@@ -1,7 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/_colorize_result_prepare.m4#L1
 # -*- 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$//']`"
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65701)
+++ Makefile.in	(revision 65702)
@@ -340,7 +340,7 @@ uncommon.mk: $(srcdir)/common.mk https://github.com/ruby/ruby/blob/trunk/Makefile.in#L340
 .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 \
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 65701)
+++ .travis.yml	(revision 65702)
@@ -48,7 +48,9 @@ addons: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L48
       - libffi
       - openssl@1...
       - zlib
-
+env:
+  global:
+    - "CONFIGURE_TTY=no"
 .org.ruby-lang.ci.matrix-definitions:
 
   - &cron-only
@@ -304,9 +306,8 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L306
   - "$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.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/