more tests

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c56380063f78ca87296ce8af5dc1910e2f84273..adf9711e6302c66087b23da124a41e38c680d791 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 TESTS = modify1 modify2 modify3 modify4 modify5 \
-       tune1 tune2 \
+       tune1 tune2 rpn1 \
        rrdcreate
 EXTRA_DIST = Makefile.am \
        alltests functions \

diff --git a/tests/modify3 b/tests/modify3
index 59af83f3d69d68cc469c62d3bba923a52c938cd4..9c3fc1db51bf3801baba05cf0dcd961027f82ed6 100755 (executable)
--- a/tests/modify3
+++ b/tests/modify3
@@ -13,11 +13,11 @@ for T in $(seq 1300000020 60 1300003020) ; do
        let N=$N+10
 done
 
-$RRDTOOL dump ${BUILD}a.rrd | diff - ${BASE}.create.dump && ok "create" || fail "create"
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}.create.dump && ok "create" || fail "create"
 
 # extend base RRA, refill from coarse RRA
 cp ${BUILD}a.rrd ${BUILD}b.rrd
 $RRDTOOL tune ${BUILD}b.rrd DEL:a RRA#0:+10 || fail modify
 
-$RRDTOOL dump ${BUILD}b.rrd | diff - ${BASE}.mod1.dump && ok "extend base RRA" || fail "extend base RRA"
+$RRDTOOL dump ${BUILD}b.rrd | $DIFF - ${BASE}.mod1.dump && ok "extend base RRA" || fail "extend base RRA"
 

diff --git a/tests/rpn1 b/tests/rpn1
new file mode 100755 (executable)
index 0000000..82165bd
--- /dev/null
+++ b/tests/rpn1
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+. $(dirname $0)/functions
+
+RRD=rpn1.rrd
+
+report "create"
+$RRDTOOL create $RRD --start 920804400 DS:speed:COUNTER:600:U:U RRA:AVERAGE:0.5:1:24 RRA:AVERAGE:0.5:6:10
+report "update"
+$RRDTOOL update $RRD 920804700:12345 920805000:12357 920805300:12363
+$RRDTOOL update $RRD 920805600:12363 920805900:12363 920806200:12373
+$RRDTOOL update $RRD 920806500:12383 920806800:12393 920807100:12399
+$RRDTOOL update $RRD 920807400:12405 920807700:12411 920808000:12415
+$RRDTOOL update $RRD 920808300:12420 920808600:12422 920808900:12423
+$RRDTOOL graphv -                          \
+      --start 920804400 --end 920808000               \
+      DEF:myspeed=$RRD:speed:AVERAGE              \
+      CDEF:nonans=myspeed,UN,0,myspeed,IF             \
+      CDEF:kmh=nonans,3600,*                          \
+      CDEF:fast=kmh,100,GT,100,0,IF                   \
+      CDEF:over=kmh,100,GT,kmh,100,-,0,IF             \
+      CDEF:good=kmh,100,GT,0,kmh,IF                   \
+      VDEF:f=fast,AVERAGE \
+      VDEF:g=good,MAXIMUM \
+      VDEF:o=over,MINIMUM \
+      PRINT:f:'%lf' \
+      PRINT:g:'%lf' \
+      PRINT:o:'%lf' | $DIFF - $BASEDIR/rpn1.output

diff --git a/tests/rpn1.output b/tests/rpn1.output
new file mode 100644 (file)
index 0000000..4a7696d
--- /dev/null
+++ b/tests/rpn1.output
@@ -0,0 +1,3 @@
+print[0] = "30.769231"
+print[1] = "72.000000"
+print[2] = "0.000000"

diff --git a/tests/tune1 b/tests/tune1
index 6d7af01b4a0e688c4e692d9c6de04002acd180a7..ee0e0d5ab26cb22e022efe3cfb00a55ea06769d0 100755 (executable)
--- a/tests/tune1
+++ b/tests/tune1
@@ -19,11 +19,11 @@ report "update"
 
 cp ${BUILD}org.rrd ${BUILD}a.rrd
 $RRDTOOL tune ${BUILD}a.rrd --heartbeat a:90 --minimum b:-100
-$RRDTOOL dump ${BUILD}a.rrd | diff - ${BASE}a-mod1.dump
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}a-mod1.dump
 report "tune heartbeat/minimum" 
 
 cp ${BUILD}org.rrd ${BUILD}a.rrd
 $RRDTOOL tune ${BUILD}a.rrd --data-source-type a:COUNTER --data-source-rename b:c
-$RRDTOOL dump ${BUILD}a.rrd | diff - ${BASE}a-mod2.dump
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}a-mod2.dump
 report "tune dst/ds-name"