Content-Disposition: inline
Message-ID: <rt-4.4.1-94889-1510142581-1392.46389-0-0@isc.org>
MIME-Version: 1.0
X-RT-Original-Encoding: utf-8
Content-Transfer-Encoding: binary
X-RT-Interface: Web
References: <RT-Ticket-46389@isc.org>
 <rt-4.4.1-31452-1508855363-846.46389-3-0@isc.org>
 <20171024162131.GB4323@isc.org>
 <rt-4.4.1-82815-1508862092-620.46389-4-0@isc.org>
 <rt-4.4.1-68750-1509444893-997.46389-4-0@isc.org>
 <rt-4.4.1-1937-1509446603-742.46389-4-0@isc.org>
 <20171031172551.GA99835@isc.org>
 <rt-4.4.1-68750-1509470755-606.46389-0-0@isc.org>
 <rt-4.4.1-11809-1509474368-398.46389-0-0@isc.org>
In-Reply-To: <rt-4.4.1-11809-1509474368-398.46389-0-0@isc.org>
Content-Type: text/plain; charset="utf-8"
X-Mailer: MIME-tools 5.508 (Entity 5.508)
RT-Send-CC:
Content-Length: 1291

Okay, how about applying this without a CHANGES note:

    commit c1fdc8f5da
    Author: Michał Kępień <michal@isc.org>
    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