diff options
| author | Jim Meyering <meyering@redhat.com> | 2007-10-29 09:47:52 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2007-10-29 09:47:52 +0100 |
| commit | 89157ad2075374f808773317d15b854edcc85cd8 (patch) | |
| tree | 8ecff29fffff3cef11699ec6f94851b92ecccb5c | |
| parent | 973d42b90de3c4af705c99536cd1f0ffccd26791 (diff) | |
| download | coreutils-89157ad2075374f808773317d15b854edcc85cd8.tar.xz | |
If $TERM is empty, don't use colors. This helps the buildbot,
since it produces its result in an environment with a tty, but
we don't want color codes in that case.
* build-aux/check.mk (am__tty_colors): Test for nonempty $TERM.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | build-aux/check.mk | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2007-10-29 Jim Meyering <meyering@redhat.com> + If $TERM is empty, don't use colors. This helps the buildbot, + since it produces its result in an environment with a tty, but + we don't want color codes in that case. + * build-aux/check.mk (am__tty_colors): Test for nonempty $TERM. + Always initialize terminal colorization string variables. * build-aux/check.mk (am__tty_colors): Always initialize red, grn, etc., In case they're defined in the environment. diff --git a/build-aux/check.mk b/build-aux/check.mk index c4dfd35e1..8f0d1c097 100644 --- a/build-aux/check.mk +++ b/build-aux/check.mk @@ -60,7 +60,7 @@ END { \ # this fails; a conservative approach. Of course do not redirect # stdout here, just stderr... am__tty_colors = \ -if test -t 1 2>/dev/null; then \ +if test -t 1 2>/dev/null && test -n "$$TERM"; then \ red='[0;31m'; \ grn='[0;32m'; \ lgn='[1;32m'; \ |