From: Wolfgang Stöggl Date: Thu, 29 Nov 2018 11:21:06 +0000 (+0100) Subject: Fix tests to support Windows time zone name X-Git-Tag: v1.7.1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5640bef72434947ea4caa0b59c870c9b9f6988e;p=thirdparty%2Frrdtool-1.x.git Fix tests to support Windows time zone name - On Windows, names of times zones are different. Substitute 'W. Europe Standard Time' with 'CET' by function seddif - Removes unnecessary diff output and fixes therefore failing tests --- diff --git a/tests/functions b/tests/functions index e9456c2c..b4c672ab 100644 --- a/tests/functions +++ b/tests/functions @@ -11,8 +11,9 @@ TOP_BUILDDIR="${TOP_BUILDDIR:-${BASEDIR}/..}" DIFF="diff -u" DIFF9=seddif +# On Windows, names of times zones are different. Substitute 'W. Europe Standard Time' with 'CET' function seddif { - perl -p -e 's/([-+]?\d\.\d+e[-+]\d+)/sprintf("%0.7e",$1)/ge' | $DIFF $@ + perl -p -e 's/([-+]?\d\.\d+e[-+]\d+)/sprintf("%0.7e",$1)/ge; s/W. Europe Standard Time/CET/g' | $DIFF $@ } BLANK=blank