Add some test scripts in new tests directory

diff --git a/tests/functions b/tests/functions
new file mode 100644 (file)
index 0000000..715abe2
--- /dev/null
+++ b/tests/functions
@@ -0,0 +1,10 @@
+
+
+function fail {
+        echo >&2 "FAILED:" "$@"
+        exit 1
+}
+
+function ok {
+        echo >&2 "OK:" "$@"
+}

diff --git a/tests/modify-test1.create.dump b/tests/modify-test1.create.dump
new file mode 100644 (file)
index 0000000..af422d6
--- /dev/null
+++ b/tests/modify-test1.create.dump
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE rrd SYSTEM "http://oss.oetiker.ch/rrdtool/rrdtool.dtd">
+<!-- Round Robin Database Dump -->
+<rrd>
+       <version>0003</version>
+       <step>60</step> <!-- Seconds -->
+       <lastupdate>1300003020</lastupdate> <!-- 2011-03-13 08:57:00 CET -->
+
+       <ds>
+               <name> a </name>
+               <type> GAUGE </type>
+               <minimal_heartbeat>120</minimal_heartbeat>
+               <min>0.0000000000e+00</min>
+               <max>NaN</max>
+
+               <!-- PDP Status -->
+               <last_ds>510</last_ds>
+               <value>0.0000000000e+00</value>
+               <unknown_sec> 0 </unknown_sec>
+       </ds>
+
+       <!-- Round Robin Archives -->
+       <rra>
+               <cf>AVERAGE</cf>
+               <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
+
+               <params>
+               <xff>5.0000000000e-01</xff>
+               </params>
+               <cdp_prep>
+                       <ds>
+                       <primary_value>5.1000000000e+02</primary_value>
+                       <secondary_value>0.0000000000e+00</secondary_value>
+                       <value>NaN</value>
+                       <unknown_datapoints>0</unknown_datapoints>
+                       </ds>
+               </cdp_prep>
+               <database>
+                       <!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
+                       <!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
+                       <!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
+                       <!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
+                       <!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
+                       <!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+                       <!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
+                       <!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+               </database>
+       </rra>
+       <rra>
+               <cf>AVERAGE</cf>
+               <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
+
+               <params>
+               <xff>5.0000000000e-01</xff>
+               </params>
+               <cdp_prep>
+                       <ds>
+                       <primary_value>4.7000000000e+02</primary_value>
+                       <secondary_value>4.9000000000e+02</secondary_value>
+                       <value>1.0100000000e+03</value>
+                       <unknown_datapoints>0</unknown_datapoints>
+                       </ds>
+               </cdp_prep>
+               <database>
+                       <!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v></row>
+                       <!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v></row>
+                       <!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+               </database>
+       </rra>
+</rrd>

diff --git a/tests/modify-test1.mod1.dump b/tests/modify-test1.mod1.dump
new file mode 100644 (file)
index 0000000..f21b825
--- /dev/null
+++ b/tests/modify-test1.mod1.dump
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE rrd SYSTEM "http://oss.oetiker.ch/rrdtool/rrdtool.dtd">
+<!-- Round Robin Database Dump -->
+<rrd>
+       <version>0003</version>
+       <step>60</step> <!-- Seconds -->
+       <lastupdate>1300003020</lastupdate> <!-- 2011-03-13 08:57:00 CET -->
+
+       <ds>
+               <name> a </name>
+               <type> GAUGE </type>
+               <minimal_heartbeat>120</minimal_heartbeat>
+               <min>0.0000000000e+00</min>
+               <max>NaN</max>
+
+               <!-- PDP Status -->
+               <last_ds>510</last_ds>
+               <value>0.0000000000e+00</value>
+               <unknown_sec> 0 </unknown_sec>
+       </ds>
+
+       <!-- Round Robin Archives -->
+       <rra>
+               <cf>AVERAGE</cf>
+               <pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
+
+               <params>
+               <xff>5.0000000000e-01</xff>
+               </params>
+               <cdp_prep>
+                       <ds>
+                       <primary_value>5.1000000000e+02</primary_value>
+                       <secondary_value>0.0000000000e+00</secondary_value>
+                       <value>NaN</value>
+                       <unknown_datapoints>0</unknown_datapoints>
+                       </ds>
+               </cdp_prep>
+               <database>
+                       <!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
+                       <!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
+                       <!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
+                       <!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
+                       <!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
+                       <!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+                       <!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
+                       <!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+               </database>
+       </rra>
+       <rra>
+               <cf>AVERAGE</cf>
+               <pdp_per_row>5</pdp_per_row> <!-- 300 seconds -->
+
+               <params>
+               <xff>5.0000000000e-01</xff>
+               </params>
+               <cdp_prep>
+                       <ds>
+                       <primary_value>4.7000000000e+02</primary_value>
+                       <secondary_value>4.9000000000e+02</secondary_value>
+                       <value>1.0100000000e+03</value>
+                       <unknown_datapoints>0</unknown_datapoints>
+                       </ds>
+               </cdp_prep>
+               <database>
+                       <!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v></row>
+                       <!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v></row>
+                       <!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
+                       <!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
+                       <!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+               </database>
+       </rra>
+</rrd>

diff --git a/tests/modify1 b/tests/modify1
new file mode 100755 (executable)
index 0000000..5d0c3c7
--- /dev/null
+++ b/tests/modify1
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+
+. $BASEDIR/functions
+
+RRDTOOL=$BASEDIR/../src/rrdtool
+
+BASE=$BASEDIR/modify-test1
+
+$RRDTOOL create ${BASE}a.rrd --start 1300000000 --step 60 DS:a:GAUGE:120:0:U  RRA:AVERAGE:0.5:1:10 RRA:AVERAGE:0.5:5:10
+# add 50 values to 
+N=10
+for T in $(seq 1300000020 60 1300003020) ; do
+       rrdtool update ${BASE}a.rrd --template a $T:$N
+       let N=$N+10
+done
+
+$RRDTOOL dump ${BASE}a.rrd | diff - $BASEDIR/modify-test1.create.dump && ok "create" || fail "create"
+
+# extend base RRA, refill from coarse RRA
+$RRDTOOL modify ${BASE}a.rrd ${BASE}b.rrd RRA#0:+10
+
+$RRDTOOL dump ${BASE}b.rrd | diff - $BASEDIR/modify-test1.mod1.dump && ok "extend base RRA" || fail "extend base RRA"
+