From a1acedaefb131a0786cb1d00cd5861604d0de491 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Sun, 5 Jul 2020 20:35:05 +0200 Subject: [PATCH] Use a known and set TERM variable to stabilize color_diagnostics tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On some distributions TERM is unset when run via Docker which failed color_diagnostics tests since ccache doesn’t enable color output if TERM is unset. Fix this by using a known TERM value. Fixes #616. --- test/run | 1 + test/suites/color_diagnostics.bash | 1 + 2 files changed, 2 insertions(+) diff --git a/test/run b/test/run index e3bce0131..672299d7e 100755 --- a/test/run +++ b/test/run @@ -307,6 +307,7 @@ TEST() { $(env | sed -n 's/^\(CCACHE_[A-Z0-9_]*\)=.*$/\1/p') EOF unset GCC_COLORS + unset TERM export CCACHE_CONFIGPATH=$ABS_TESTDIR/ccache.conf export CCACHE_DETECT_SHEBANG=1 diff --git a/test/suites/color_diagnostics.bash b/test/suites/color_diagnostics.bash index 60254a186..b2b009962 100644 --- a/test/suites/color_diagnostics.bash +++ b/test/suites/color_diagnostics.bash @@ -30,6 +30,7 @@ SUITE_color_diagnostics_SETUP() { fi unset GCC_COLORS + export TERM=vt100 } color_diagnostics_expect_color() { -- 2.47.3