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

diff --git a/tests/pdp-calc1 b/tests/pdp-calc1
index c8e018de61bd4f510c1cbd201f9e3bc328d86f8e..4700595cc4032958b2c6bdd58bab21e5fabad135 100755 (executable)
--- 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 783b6b83a8d053b240b83fb5c960cc8e9c785a0b..75a600e95ab5acf31db0789948fc50fa3e2c7740 100644 (file)
--- 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 2df89d4ebcf25f1438ab69cf9fdd2ebd5cd0e7e7..fbbcfc47185b8f2c6b8489b29f94a1259f7daf73 100644 (file)
--- 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 1ff06f665754a4bafa9d9930bf0f55f8feb4230a..3586db8f8a53e3e7d9141d34830b35ad1b06c44e 100644 (file)
--- 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