From 160b1eda3d15bcb33967595fd3d676fd598bf572 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Mon, 27 Jul 2015 15:13:59 +0200 Subject: [PATCH] ignore nan vs -nan ... --- tests/vformatter1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vformatter1 b/tests/vformatter1 index 6658f229..2f44a675 100755 --- a/tests/vformatter1 +++ b/tests/vformatter1 @@ -8,7 +8,7 @@ function rtest() { testname="$1" xpected="$2" shift 2 || exit 1 - $DIFF <(echo -e "$xpected") <($RRDTOOL "$@") + $DIFF <(echo -e "$xpected") <($RRDTOOL "$@"|sed s/-nan/nan/g) report "$testname" #&& echo "OK: $testname" || echo "FAIL: $testname" } @@ -18,13 +18,13 @@ $RRDTOOL create vfmt1.rrd --start 1420070400 --step 60s DS:v:GAUGE:60:U:U RRA:LA declare -a graphargs graphargs=(graph /dev/null --start 1420070400 --end 1420071000 'DEF:dv=vfmt1.rrd:v:LAST' 'VDEF:v=dv,LAST') -rtest "No data, numeric" '0x0\n-nan' "${graphargs[@]}" 'PRINT:v:%0.1lf' +rtest "No data, numeric" '0x0\nnan' "${graphargs[@]}" 'PRINT:v:%0.1lf' rtest "No data, sampling timestamp" '0x0\n---------- --:--:--' "${graphargs[@]}" 'PRINT:v:%F %T:strftime' -rtest "No data, value timestamp" '0x0\n-nan' "${graphargs[@]}" 'PRINT:v:%F %T:valstrftime' +rtest "No data, value timestamp" '0x0\nnan' "${graphargs[@]}" 'PRINT:v:%F %T:valstrftime' -rtest "No data, value duration" '0x0\n-nan' "${graphargs[@]}" 'PRINT:v::valstrfduration' +rtest "No data, value duration" '0x0\nnan' "${graphargs[@]}" 'PRINT:v::valstrfduration' $RRDTOOL update vfmt1.rrd --template v -- 1420070460:0 || exit 1 -- 2.47.2