From 6892508386bf9b5651fdb86b3931349073922d40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wolfgang=20St=C3=B6ggl?= Date: Sat, 6 Jan 2024 18:00:45 +0100 Subject: [PATCH] Fix failing test pdp-calc1 The number of decimal places or the format can be different in the output depending on the platform. - The failing test has appeared under msys2 (MINGW32 and MINGW64), where the exponential notation has changed: E.g. e+000 instead of e+00 - Use DIFF9 also in test pdp-calc1, which reduces the number of decimal places to 7 using "%0.7e". See DIFF9 in tests/functions. - Update the pdp-calc1 output files accordingly - Fixes failing test pdp-calc1 under msys2 --- tests/pdp-calc1 | 6 +-- tests/pdp-calc1-1-avg-300.output | 16 ++++---- tests/pdp-calc1-1-avg-60.output | 64 ++++++++++++++++---------------- tests/pdp-calc1-1-max-300.output | 16 ++++---- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/pdp-calc1 b/tests/pdp-calc1 index c8e018de..4700595c 100755 --- a/tests/pdp-calc1 +++ b/tests/pdp-calc1 @@ -61,9 +61,9 @@ report "update all" is_cached && exit 0 -$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 60 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-60.output +$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 60 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF9 --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-60.output report "fetch avg 60" -$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-300.output +$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF9 --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-300.output report "fetch avg 300" -$RRDTOOL fetch ${BUILD}.rrd MAX -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-max-300.output +$RRDTOOL fetch ${BUILD}.rrd MAX -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF9 --ignore-space-change - $BASEDIR/pdp-calc1-1-max-300.output report "fetch max 300" diff --git a/tests/pdp-calc1-1-avg-300.output b/tests/pdp-calc1-1-avg-300.output index 783b6b83..75a600e9 100644 --- a/tests/pdp-calc1-1-avg-300.output +++ b/tests/pdp-calc1-1-avg-300.output @@ -1,10 +1,10 @@ Gauge Counter Absolute -1548500700: nan nan nan -1548501000: 9.0000000000e-01 9.0000000000e-01 9.0000000000e-01 -1548501300: 1.2500000000e+00 nan 1.1785714286e+00 -1548501600: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501900: 1.9666666667e+00 1.9666666667e+00 1.9666666667e+00 -1548502200: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502500: 4.2333333333e+00 4.2333333333e+00 4.2333333333e+00 -1548502800: nan nan nan +1548500700: nan nan nan +1548501000: 9.0000000e-01 9.0000000e-01 9.0000000e-01 +1548501300: 1.2500000e+00 nan 1.1785714e+00 +1548501600: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501900: 1.9666667e+00 1.9666667e+00 1.9666667e+00 +1548502200: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502500: 4.2333333e+00 4.2333333e+00 4.2333333e+00 +1548502800: nan nan nan diff --git a/tests/pdp-calc1-1-avg-60.output b/tests/pdp-calc1-1-avg-60.output index 2df89d4e..fbbcfc47 100644 --- a/tests/pdp-calc1-1-avg-60.output +++ b/tests/pdp-calc1-1-avg-60.output @@ -1,34 +1,34 @@ Gauge Counter Absolute -1548500700: nan nan nan -1548500760: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548500820: 5.0000000000e-01 5.0000000000e-01 5.0000000000e-01 -1548500880: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548500940: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501000: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501060: 2.0000000000e+00 1.7142857143e+00 1.7142857143e+00 -1548501120: nan nan nan -1548501180: 1.0000000000e+00 nan 1.0000000000e+00 -1548501240: 1.0000000000e+00 nan 1.0000000000e+00 -1548501300: 1.0000000000e+00 nan 1.0000000000e+00 -1548501360: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501420: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501480: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501540: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501600: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501660: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501720: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501780: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501840: 6.8333333333e+00 6.8333333333e+00 6.8333333333e+00 -1548501900: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548501960: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502020: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502080: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502140: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502200: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502260: 3.6666666667e+00 3.6666666667e+00 3.6666666667e+00 -1548502320: 4.0000000000e+00 4.0000000000e+00 4.0000000000e+00 -1548502380: 4.0000000000e+00 4.0000000000e+00 4.0000000000e+00 -1548502440: 4.5000000000e+00 4.5000000000e+00 4.5000000000e+00 -1548502500: 5.0000000000e+00 5.0000000000e+00 5.0000000000e+00 -1548502560: nan nan nan +1548500700: nan nan nan +1548500760: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548500820: 5.0000000e-01 5.0000000e-01 5.0000000e-01 +1548500880: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548500940: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501000: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501060: 2.0000000e+00 1.7142857e+00 1.7142857e+00 +1548501120: nan nan nan +1548501180: 1.0000000e+00 nan 1.0000000e+00 +1548501240: 1.0000000e+00 nan 1.0000000e+00 +1548501300: 1.0000000e+00 nan 1.0000000e+00 +1548501360: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501420: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501480: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501540: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501600: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501660: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501720: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501780: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501840: 6.8333333e+00 6.8333333e+00 6.8333333e+00 +1548501900: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548501960: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502020: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502080: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502140: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502200: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502260: 3.6666667e+00 3.6666667e+00 3.6666667e+00 +1548502320: 4.0000000e+00 4.0000000e+00 4.0000000e+00 +1548502380: 4.0000000e+00 4.0000000e+00 4.0000000e+00 +1548502440: 4.5000000e+00 4.5000000e+00 4.5000000e+00 +1548502500: 5.0000000e+00 5.0000000e+00 5.0000000e+00 +1548502560: nan nan nan diff --git a/tests/pdp-calc1-1-max-300.output b/tests/pdp-calc1-1-max-300.output index 1ff06f66..3586db8f 100644 --- a/tests/pdp-calc1-1-max-300.output +++ b/tests/pdp-calc1-1-max-300.output @@ -1,10 +1,10 @@ Gauge Counter Absolute -1548500700: nan nan nan -1548501000: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501300: 2.0000000000e+00 nan 1.7142857143e+00 -1548501600: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501900: 6.8333333333e+00 6.8333333333e+00 6.8333333333e+00 -1548502200: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 -1548502500: 5.0000000000e+00 5.0000000000e+00 5.0000000000e+00 -1548502800: nan nan nan +1548500700: nan nan nan +1548501000: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501300: 2.0000000e+00 nan 1.7142857e+00 +1548501600: 1.0000000e+00 1.0000000e+00 1.0000000e+00 +1548501900: 6.8333333e+00 6.8333333e+00 6.8333333e+00 +1548502200: 0.0000000e+00 0.0000000e+00 0.0000000e+00 +1548502500: 5.0000000e+00 5.0000000e+00 5.0000000e+00 +1548502800: nan nan nan -- 2.47.2