]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commitdiff
Tests: also truncate output to 9 digits if <1 639/head
authorJean-Michel Vourgère <nirgal@debian.org>
Mon, 27 Jul 2015 16:40:04 +0000 (18:40 +0200)
committerJean-Michel Vourgère <nirgal@debian.org>
Mon, 27 Jul 2015 16:40:04 +0000 (18:40 +0200)
Previous fix worked for XXXXXXXXXe+X numbers.
We also need XXXXXXXXXe-X.

17 files changed:
tests/dcounter1.output
tests/functions
tests/modify-test1.create.dump
tests/modify-test1.mod1.dump
tests/modify-test3.create.dump
tests/modify-test3.mod1.dump
tests/modify2-testa-create.dump
tests/modify2-testb-mod1.dump
tests/modify2-testc-mod1.dump
tests/modify4-testa1-create.dump
tests/modify4-testa2-create.dump
tests/modify5-testa1-create.dump
tests/modify5-testa2-create.dump
tests/tune1-testa-mod1.dump
tests/tune1-testa-mod2.dump
tests/tune2-testa-mod1.dump
tests/tune2-testorg.dump

index b575148f69ac78c77b5bde4a944ed86e3ae02df9..506d48ecb5e5528fa5473f12006d33e163688ec5 100644 (file)
@@ -1,25 +1,25 @@
-1300000800: -1.1709250000e-03 3.6784869417e-02
-1300001400: -9.6982916667e-04 3.6354246042e-02
-1300002000: -9.1195416667e-04 3.5968226500e-02
-1300002600: -8.5638333333e-04 3.5596561833e-02
-1300003200: -8.8416666667e-04 3.5234039708e-02
-1300003800: -8.2716666667e-04 3.4878341208e-02
-1300004400: -8.5566666667e-04 3.4524600167e-02
-1300005000: -8.5566666667e-04 3.4171311250e-02
-1300005600: -7.9866250000e-04 3.3823459875e-02
-1300006200: -7.7000416667e-04 3.3493368042e-02
-1300006800: -6.5600000000e-04 3.3196800792e-02
-1300007400: -5.7050000000e-04 3.2941915500e-02
-1300008000: -4.5704583333e-04 3.2729010042e-02
-1300008600: -3.9933333333e-04 3.2552590750e-02
-1300009200: -3.4233333333e-04 3.2397959917e-02
-1300009800: -3.1366666667e-04 3.2259368875e-02
-1300010400: -3.1383333333e-04 3.2127014750e-02
-1300011000: -3.4216666667e-04 3.1992873792e-02
-1300011600: -3.4233333333e-04 3.1852899750e-02
-1300012200: -3.9933333333e-04 3.1696810125e-02
-1300012800: -4.5633333333e-04 3.1520222125e-02
-1300013400: -5.4128333333e-04 3.1313820250e-02
-1300014000: -6.5600000000e-04 3.1065260708e-02
-1300014600: -9.4045833333e-04 3.0735643500e-02
-1300015200: -1.6799791667e-03 3.0233410000e-02
+1300000800: -1.170925000e-03 3.678486941e-02
+1300001400: -9.698291666e-04 3.635424604e-02
+1300002000: -9.119541666e-04 3.596822650e-02
+1300002600: -8.563833333e-04 3.559656183e-02
+1300003200: -8.841666666e-04 3.523403970e-02
+1300003800: -8.271666666e-04 3.487834120e-02
+1300004400: -8.556666666e-04 3.452460016e-02
+1300005000: -8.556666666e-04 3.417131125e-02
+1300005600: -7.986625000e-04 3.382345987e-02
+1300006200: -7.700041666e-04 3.349336804e-02
+1300006800: -6.560000000e-04 3.319680079e-02
+1300007400: -5.705000000e-04 3.294191550e-02
+1300008000: -4.570458333e-04 3.272901004e-02
+1300008600: -3.993333333e-04 3.255259075e-02
+1300009200: -3.423333333e-04 3.239795991e-02
+1300009800: -3.136666666e-04 3.225936887e-02
+1300010400: -3.138333333e-04 3.212701475e-02
+1300011000: -3.421666666e-04 3.199287379e-02
+1300011600: -3.423333333e-04 3.185289975e-02
+1300012200: -3.993333333e-04 3.169681012e-02
+1300012800: -4.563333333e-04 3.152022212e-02
+1300013400: -5.412833333e-04 3.131382025e-02
+1300014000: -6.560000000e-04 3.106526070e-02
+1300014600: -9.404583333e-04 3.073564350e-02
+1300015200: -1.679979166e-03 3.023341000e-02
index cdb286f00338f69a4b8b2b5fd5d21d9187dbc89d..e13196a0676d79632cc71b1e6a88b80c83d17807 100644 (file)
@@ -12,7 +12,7 @@ DIFF="diff -u"
 DIFF9=seddif
 
 function seddif {
-   sed -e "s/\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)[0-9]\(e+[0-9]\)/\1\2/g" | $DIFF $@
+   sed -e "s/\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)[0-9]\(e[+-][0-9]\)/\1\2/g" | $DIFF $@
 }
 
 #
index d279c38854771d2a1ce93f623bfd20e529e85ed7..e6e00d519d0217e19c05f34c5460122d8f7786fa 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -53,7 +53,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 8cbd5a08c56d5aa3e0b9b9710a7987eb5e110bfb..c6dcff5de05623ca5c143588aadb2639bc6b1bc4 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -63,7 +63,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index f148e4fdee0efdcec5e13e4bf51e077b3209d1d1..a6c20449c32e5a6c8e3ab051673315b479a758c0 100644 (file)
@@ -51,7 +51,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -91,7 +91,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 897cab7d5d24c9adb01ae4a16fce5b86020c9200..92c2383940daaabbbe9d36126d43e2eca3e2414c 100644 (file)
@@ -38,7 +38,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -82,7 +82,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 425243cd01482eeb0078bf1ecf40cfb5ed624302..cf38d80611b678ff696ca8ee1481c52a71b88cc2 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 27e943dd39b8da405d62db5409313f9cd90515a6..aedb3db86a53161d82bf27963f9b1669a1ec4897 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 191394c055eb970a36a664a9215ee64f92e9fe4a..c5c5f6d45a42a4fb34d99ae1f73b51309563dc92 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>2</pdp_per_row> <!-- 120 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index e3953c942bb763eb5f66ba097f7c623dd5d620d9..cd460063506b78a74a375bb16d93667429409ff7 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 4d16d5e80109a7586efbf2f26de20fab24bcd22f..598b4bbddcfa15c06c20f71dd40bbe22989dc212 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>4</pdp_per_row> <!-- 240 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index e3953c942bb763eb5f66ba097f7c623dd5d620d9..cd460063506b78a74a375bb16d93667429409ff7 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 4d16d5e80109a7586efbf2f26de20fab24bcd22f..598b4bbddcfa15c06c20f71dd40bbe22989dc212 100644 (file)
@@ -25,7 +25,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
                <pdp_per_row>4</pdp_per_row> <!-- 240 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 5008f74f035424cc554f92a2b80b7962a3cf32dc..a847167805eb3ecd26f7dd509d547aafa2cec60f 100644 (file)
@@ -38,7 +38,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -72,7 +72,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index 64bae28197085c26a4b9620a5bd6fc2327c6384e..ccb31f9bc06ec6f0552b141bb8710ad91ba69c7a 100644 (file)
@@ -38,7 +38,7 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
@@ -72,7 +72,7 @@
                <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
 
                <params>
-               <xff>5.0000000000e-01</xff>
+               <xff>5.000000000e-01</xff>
                </params>
                <cdp_prep>
                        <ds>
index e504af0ce2c12d1d841ed5eca7d3bdee91125cb3..ed7866fba850ce347510384ddacc6921b3493957 100644 (file)
@@ -38,8 +38,8 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <hw_alpha>9.0000000000e-01</hw_alpha>
-               <hw_beta>4.0000000000e-01</hw_beta>
+               <hw_alpha>9.000000000e-01</hw_alpha>
+               <hw_beta>4.000000000e-01</hw_beta>
                <dependent_rra_idx>1</dependent_rra_idx>
                </params>
                <cdp_prep>
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <seasonal_gamma>9.0000000000e-01</seasonal_gamma>
+               <seasonal_gamma>9.000000000e-01</seasonal_gamma>
                <seasonal_smooth_idx>135</seasonal_smooth_idx>
                <dependent_rra_idx>0</dependent_rra_idx>
                </params>
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <seasonal_gamma>9.0000000000e-01</seasonal_gamma>
+               <seasonal_gamma>9.000000000e-01</seasonal_gamma>
                <seasonal_smooth_idx>135</seasonal_smooth_idx>
                <dependent_rra_idx>0</dependent_rra_idx>
                </params>
index b4aa19cd02fd8a1b4ada6ca14c50cb0e39c02e4d..8f63dccc10c198e041836730d7a8c8042c758889 100644 (file)
@@ -38,8 +38,8 @@
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <hw_alpha>9.0000000000e-01</hw_alpha>
-               <hw_beta>8.0000000000e-01</hw_beta>
+               <hw_alpha>9.000000000e-01</hw_alpha>
+               <hw_beta>8.000000000e-01</hw_beta>
                <dependent_rra_idx>1</dependent_rra_idx>
                </params>
                <cdp_prep>
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <seasonal_gamma>9.0000000000e-01</seasonal_gamma>
+               <seasonal_gamma>9.000000000e-01</seasonal_gamma>
                <seasonal_smooth_idx>113</seasonal_smooth_idx>
                <dependent_rra_idx>0</dependent_rra_idx>
                </params>
                <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
                <params>
-               <seasonal_gamma>9.0000000000e-01</seasonal_gamma>
+               <seasonal_gamma>9.000000000e-01</seasonal_gamma>
                <seasonal_smooth_idx>113</seasonal_smooth_idx>
                <dependent_rra_idx>0</dependent_rra_idx>
                </params>