From: Jean-Michel Vourgère Date: Mon, 27 Jul 2015 16:40:04 +0000 (+0200) Subject: Tests: also truncate output to 9 digits if <1 X-Git-Tag: v1.5.4~18^2~1^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F639%2Fhead;p=thirdparty%2Frrdtool-1.x.git Tests: also truncate output to 9 digits if <1 Previous fix worked for XXXXXXXXXe+X numbers. We also need XXXXXXXXXe-X. --- diff --git a/tests/dcounter1.output b/tests/dcounter1.output index b575148f..506d48ec 100644 --- a/tests/dcounter1.output +++ b/tests/dcounter1.output @@ -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 diff --git a/tests/functions b/tests/functions index cdb286f0..e13196a0 100644 --- a/tests/functions +++ b/tests/functions @@ -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 $@ } # diff --git a/tests/modify-test1.create.dump b/tests/modify-test1.create.dump index d279c388..e6e00d51 100644 --- a/tests/modify-test1.create.dump +++ b/tests/modify-test1.create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -53,7 +53,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify-test1.mod1.dump b/tests/modify-test1.mod1.dump index 8cbd5a08..c6dcff5d 100644 --- a/tests/modify-test1.mod1.dump +++ b/tests/modify-test1.mod1.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -63,7 +63,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify-test3.create.dump b/tests/modify-test3.create.dump index f148e4fd..a6c20449 100644 --- a/tests/modify-test3.create.dump +++ b/tests/modify-test3.create.dump @@ -51,7 +51,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -91,7 +91,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify-test3.mod1.dump b/tests/modify-test3.mod1.dump index 897cab7d..92c23839 100644 --- a/tests/modify-test3.mod1.dump +++ b/tests/modify-test3.mod1.dump @@ -38,7 +38,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -82,7 +82,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify2-testa-create.dump b/tests/modify2-testa-create.dump index 425243cd..cf38d806 100644 --- a/tests/modify2-testa-create.dump +++ b/tests/modify2-testa-create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify2-testb-mod1.dump b/tests/modify2-testb-mod1.dump index 27e943dd..aedb3db8 100644 --- a/tests/modify2-testb-mod1.dump +++ b/tests/modify2-testb-mod1.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -173,7 +173,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -233,7 +233,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify2-testc-mod1.dump b/tests/modify2-testc-mod1.dump index 191394c0..c5c5f6d4 100644 --- a/tests/modify2-testc-mod1.dump +++ b/tests/modify2-testc-mod1.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -223,7 +223,7 @@ 2 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify4-testa1-create.dump b/tests/modify4-testa1-create.dump index e3953c94..cd460063 100644 --- a/tests/modify4-testa1-create.dump +++ b/tests/modify4-testa1-create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify4-testa2-create.dump b/tests/modify4-testa2-create.dump index 4d16d5e8..598b4bbd 100644 --- a/tests/modify4-testa2-create.dump +++ b/tests/modify4-testa2-create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -223,7 +223,7 @@ 4 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify5-testa1-create.dump b/tests/modify5-testa1-create.dump index e3953c94..cd460063 100644 --- a/tests/modify5-testa1-create.dump +++ b/tests/modify5-testa1-create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/modify5-testa2-create.dump b/tests/modify5-testa2-create.dump index 4d16d5e8..598b4bbd 100644 --- a/tests/modify5-testa2-create.dump +++ b/tests/modify5-testa2-create.dump @@ -25,7 +25,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -143,7 +143,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -163,7 +163,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -183,7 +183,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -203,7 +203,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 @@ -223,7 +223,7 @@ 4 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/tune1-testa-mod1.dump b/tests/tune1-testa-mod1.dump index 5008f74f..a8471678 100644 --- a/tests/tune1-testa-mod1.dump +++ b/tests/tune1-testa-mod1.dump @@ -38,7 +38,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -72,7 +72,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/tune1-testa-mod2.dump b/tests/tune1-testa-mod2.dump index 64bae281..ccb31f9b 100644 --- a/tests/tune1-testa-mod2.dump +++ b/tests/tune1-testa-mod2.dump @@ -38,7 +38,7 @@ 1 - 5.0000000000e-01 + 5.000000000e-01 @@ -72,7 +72,7 @@ 5 - 5.0000000000e-01 + 5.000000000e-01 diff --git a/tests/tune2-testa-mod1.dump b/tests/tune2-testa-mod1.dump index e504af0c..ed7866fb 100644 --- a/tests/tune2-testa-mod1.dump +++ b/tests/tune2-testa-mod1.dump @@ -38,8 +38,8 @@ 1 - 9.0000000000e-01 - 4.0000000000e-01 + 9.000000000e-01 + 4.000000000e-01 1 @@ -360,7 +360,7 @@ 1 - 9.0000000000e-01 + 9.000000000e-01 135 0 @@ -532,7 +532,7 @@ 1 - 9.0000000000e-01 + 9.000000000e-01 135 0 diff --git a/tests/tune2-testorg.dump b/tests/tune2-testorg.dump index b4aa19cd..8f63dccc 100644 --- a/tests/tune2-testorg.dump +++ b/tests/tune2-testorg.dump @@ -38,8 +38,8 @@ 1 - 9.0000000000e-01 - 8.0000000000e-01 + 9.000000000e-01 + 8.000000000e-01 1 @@ -360,7 +360,7 @@ 1 - 9.0000000000e-01 + 9.000000000e-01 113 0 @@ -532,7 +532,7 @@ 1 - 9.0000000000e-01 + 9.000000000e-01 113 0