fixed stray mentions of rrdtool (not $RRDTOOL) in test scripts, causing them to fail...

diff --git a/.travis.yml b/.travis.yml
index 69ae021e605c9dcc098772ae3181228d7a634943..8f454769c5eb47f8613acb699b25031c5c4d7717 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@ before_script:
 script:
   - ./configure --prefix=/opt/rrdtool-master
   - make
+  - cd tests && ./alltests /opt/rrdtool-master/bin/rrdtool
   - sudo make install
   - /opt/rrdtool-master/bin/rrdtool
   - /opt/rrdtool-master/share/rrdtool/examples/4charts.pl
-  - cd tests && ./alltests /opt/rrdtool-master/bin/rrdtool
 

diff --git a/tests/modify1 b/tests/modify1
index 565ac5974a84108cc82b9278e44a438770a333b9..467f8ec23401fc56b7e2b4b42014767f414d40aa 100755 (executable)
--- a/tests/modify1
+++ b/tests/modify1
@@ -8,7 +8,7 @@ $RRDTOOL create ${BASE}a.rrd --start 1300000000 --step 60 DS:a:GAUGE:120:0:U  RR
 # add 50 values to 
 N=10
 for T in $(seq 1300000020 60 1300003020) ; do
-       rrdtool update ${BASE}a.rrd --template a $T:$N
+       $RRDTOOL update ${BASE}a.rrd --template a $T:$N
        let N=$N+10
 done
 

diff --git a/tests/modify3 b/tests/modify3
index 0db4a42034d0c74b8125e8767e980362c2f7f3f5..c366ef15b0fdfbbba8dc6f7fadc89075a8d9218e 100755 (executable)
--- a/tests/modify3
+++ b/tests/modify3
@@ -8,7 +8,7 @@ $RRDTOOL create ${BASE}a.rrd --start 1300000000 --step 60 DS:a:GAUGE:120:0:U  DS
 # add 50 values to 
 N=10
 for T in $(seq 1300000020 60 1300003020) ; do
-       rrdtool update ${BASE}a.rrd --template a:b:c $T:$N:$((10000+$N)):$((20000+$N))
+       $RRDTOOL update ${BASE}a.rrd --template a:b:c $T:$N:$((10000+$N)):$((20000+$N))
        let N=$N+10
 done