From: Tobias Oetiker Date: Thu, 6 Aug 2015 06:12:39 +0000 (+0200) Subject: integrate xport tests X-Git-Tag: v1.5.4~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac8896773f22475e8711ed547b4c4b83174c1b47;p=thirdparty%2Frrdtool-1.x.git integrate xport tests --- diff --git a/tests/Makefile.am b/tests/Makefile.am index a658a1a8..8279654e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,8 @@ TESTS = modify1 modify2 modify3 modify4 modify5 \ dump-restore \ create-with-source-1 create-with-source-2 create-with-source-3 \ create-with-source-4 create-with-source-and-mapping-1 \ - create-from-template-1 dcounter1 vformatter1 + create-from-template-1 dcounter1 vformatter1 xport1 + EXTRA_DIST = Makefile.am \ alltests functions $(TESTS) \ modify-test1.create.dump modify-test1.mod1.dump \ @@ -15,12 +16,15 @@ EXTRA_DIST = Makefile.am \ rrdcreate \ tune1-testa-mod1.dump tune1-testa-mod2.dump tune1-testorg.dump \ tune2-testa-mod1.dump tune2-testorg.dump \ - valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn2.output + valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn2.output \ + xport1.json.output xport1.output xport1.xml.output + # NB: AM_TESTS_ENVIRONMENT not available until automake 1.12 TESTS_ENVIRONMENT = \ BASEDIR=${abs_srcdir} ; export BASEDIR ; \ BUILDDIR=${abs_builddir} ; export BUILDDIR ; \ TOP_BUILDDIR=${abs_top_builddir} ; export TOP_BUILDDIR ; + CLEANFILES = *.rrd \ ct.out dur.out \ modify5-testa1-mod.dump modify5-testa2-mod.dump \ diff --git a/tests/Makefile.in b/tests/Makefile.in index e6b36c15..bfb4f9d4 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -530,7 +530,7 @@ TESTS = modify1 modify2 modify3 modify4 modify5 \ dump-restore \ create-with-source-1 create-with-source-2 create-with-source-3 \ create-with-source-4 create-with-source-and-mapping-1 \ - create-from-template-1 dcounter1 vformatter1 + create-from-template-1 dcounter1 vformatter1 xport1 EXTRA_DIST = Makefile.am \ alltests functions $(TESTS) \ @@ -542,7 +542,9 @@ EXTRA_DIST = Makefile.am \ rrdcreate \ tune1-testa-mod1.dump tune1-testa-mod2.dump tune1-testorg.dump \ tune2-testa-mod1.dump tune2-testorg.dump \ - valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn2.output + valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn2.output \ + xport1.json.output xport1.output xport1.xml.output + # NB: AM_TESTS_ENVIRONMENT not available until automake 1.12 TESTS_ENVIRONMENT = \ @@ -876,6 +878,13 @@ vformatter1.log: vformatter1 --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +xport1.log: xport1 + @p='xport1'; \ + b='xport1'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/tests/xport1.json.output b/tests/xport1.json.output index 7de342ef..2c75b9a7 100644 --- a/tests/xport1.json.output +++ b/tests/xport1.json.output @@ -17,19 +17,19 @@ [ -8.271666667e-04, 3.487834121e-02 ], [ -8.556666667e-04, 3.452460017e-02 ], [ -8.556666667e-04, 3.417131125e-02 ], - [ -7.986625000e-04, 3.382345988e-02 ], + [ -7.986625000e-04, 3.382345987e-02 ], [ -7.700041667e-04, 3.349336804e-02 ], [ -6.560000000e-04, 3.319680079e-02 ], [ -5.705000000e-04, 3.294191550e-02 ], [ -4.570458333e-04, 3.272901004e-02 ], [ -3.993333333e-04, 3.255259075e-02 ], [ -3.423333333e-04, 3.239795992e-02 ], - [ -3.136666667e-04, 3.225936888e-02 ], + [ -3.136666667e-04, 3.225936887e-02 ], [ -3.138333333e-04, 3.212701475e-02 ], [ -3.421666667e-04, 3.199287379e-02 ], [ -3.423333333e-04, 3.185289975e-02 ], - [ -3.993333333e-04, 3.169681012e-02 ], - [ -4.563333333e-04, 3.152022213e-02 ], + [ -3.993333333e-04, 3.169681013e-02 ], + [ -4.563333333e-04, 3.152022212e-02 ], [ -5.412833333e-04, 3.131382025e-02 ], [ -6.560000000e-04, 3.106526071e-02 ], [ -9.404583333e-04, 3.073564350e-02 ], diff --git a/tests/xport1.xml.output b/tests/xport1.xml.output index d4268688..953c48d2 100644 --- a/tests/xport1.xml.output +++ b/tests/xport1.xml.output @@ -21,19 +21,19 @@ -8.271666667e-043.487834121e-02 -8.556666667e-043.452460017e-02 -8.556666667e-043.417131125e-02 - -7.986625000e-043.382345988e-02 + -7.986625000e-043.382345987e-02 -7.700041667e-043.349336804e-02 -6.560000000e-043.319680079e-02 -5.705000000e-043.294191550e-02 -4.570458333e-043.272901004e-02 -3.993333333e-043.255259075e-02 -3.423333333e-043.239795992e-02 - -3.136666667e-043.225936888e-02 + -3.136666667e-043.225936887e-02 -3.138333333e-043.212701475e-02 -3.421666667e-043.199287379e-02 -3.423333333e-043.185289975e-02 - -3.993333333e-043.169681012e-02 - -4.563333333e-043.152022213e-02 + -3.993333333e-043.169681013e-02 + -4.563333333e-043.152022212e-02 -5.412833333e-043.131382025e-02 -6.560000000e-043.106526071e-02 -9.404583333e-043.073564350e-02