integrate xport tests

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a658a1a8469888d8a83891ff7b39dc129822d3be..8279654e9b5c6c17a83a590a3eca9aed9dfcedfa 100644 (file)
--- 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 e6b36c15cde5b03d5be927998c5478a3283d50a8..bfb4f9d40e19b620e71e811482ce97651a8edff3 100644 (file)
--- 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 7de342ef77519be41fa45614785b0d81c5f8a07c..2c75b9a71505be6200b1c3ea37575189796cbaf3 100644 (file)
--- 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 d426868825a4aaccf07b97147a5bc81b35f64400..953c48d2ccc750835e33c0320b18be6bec7df5a0 100644 (file)
--- a/tests/xport1.xml.output
+++ b/tests/xport1.xml.output
@@ -21,19 +21,19 @@
     <row><v0>-8.271666667e-04</v0><v1>3.487834121e-02</v1></row>
     <row><v0>-8.556666667e-04</v0><v1>3.452460017e-02</v1></row>
     <row><v0>-8.556666667e-04</v0><v1>3.417131125e-02</v1></row>
-    <row><v0>-7.986625000e-04</v0><v1>3.382345988e-02</v1></row>
+    <row><v0>-7.986625000e-04</v0><v1>3.382345987e-02</v1></row>
     <row><v0>-7.700041667e-04</v0><v1>3.349336804e-02</v1></row>
     <row><v0>-6.560000000e-04</v0><v1>3.319680079e-02</v1></row>
     <row><v0>-5.705000000e-04</v0><v1>3.294191550e-02</v1></row>
     <row><v0>-4.570458333e-04</v0><v1>3.272901004e-02</v1></row>
     <row><v0>-3.993333333e-04</v0><v1>3.255259075e-02</v1></row>
     <row><v0>-3.423333333e-04</v0><v1>3.239795992e-02</v1></row>
-    <row><v0>-3.136666667e-04</v0><v1>3.225936888e-02</v1></row>
+    <row><v0>-3.136666667e-04</v0><v1>3.225936887e-02</v1></row>
     <row><v0>-3.138333333e-04</v0><v1>3.212701475e-02</v1></row>
     <row><v0>-3.421666667e-04</v0><v1>3.199287379e-02</v1></row>
     <row><v0>-3.423333333e-04</v0><v1>3.185289975e-02</v1></row>
-    <row><v0>-3.993333333e-04</v0><v1>3.169681012e-02</v1></row>
-    <row><v0>-4.563333333e-04</v0><v1>3.152022213e-02</v1></row>
+    <row><v0>-3.993333333e-04</v0><v1>3.169681013e-02</v1></row>
+    <row><v0>-4.563333333e-04</v0><v1>3.152022212e-02</v1></row>
     <row><v0>-5.412833333e-04</v0><v1>3.131382025e-02</v1></row>
     <row><v0>-6.560000000e-04</v0><v1>3.106526071e-02</v1></row>
     <row><v0>-9.404583333e-04</v0><v1>3.073564350e-02</v1></row>