Okay, how about applying this without a CHANGES note: commit c1fdc8f5da Author: Michał Kępień Date: Wed Nov 8 12:55:14 2017 +0100 [master] Make cds system test behave more nicely on FreeBSD and slower machines diff --git a/bin/tests/system/cds/checkmtime.pl b/bin/tests/system/cds/checkmtime.pl index ea3fa5d27a..3a1347f7be 100644 --- a/bin/tests/system/cds/checkmtime.pl +++ b/bin/tests/system/cds/checkmtime.pl @@ -10,4 +10,4 @@ my $target = shift; my $file = shift; my $mtime = time - (stat $file)[9]; die "bad mtime $mtime" - unless abs($mtime - $target) < 3; + unless ($mtime - $target >= 0 && $mtime - $target < 60); diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 6b2320e202..1ef20a09b9 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -142,7 +142,7 @@ NZD=@NZD_TOOLS@ # # Set up color-coded test output # -if test -t 1 && type tput > /dev/null 2>&1 ; then +if test -t 1 && type tput > /dev/null 2>&1 && tput setaf 0 > /dev/null 2>&1 ; then COLOR_FAIL=`tput setaf 1` # red COLOR_WARN=`tput setaf 3` # yellow COLOR_PASS=`tput setaf 2` # green