From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sat, 29 Mar 2014 05:29:30 +0000 (+0100)
Subject: Merge branch 'master' of github.com:oetiker/rrdtool-1.x
X-Git-Tag: v1.5.0-rc1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a1b5a3af821367f4366a13ca645f3b020d912c3;p=thirdparty%2Frrdtool-1.x.git

Merge branch 'master' of github.com:oetiker/rrdtool-1.x

Conflicts:
	.travis.yml
---

2a1b5a3af821367f4366a13ca645f3b020d912c3
diff --cc .travis.yml
index fd3d292b,63bc3bdc..e44cd25d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -8,16 -8,16 +8,17 @@@ perl
    - "5.8"
  
  install: 
-   - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev 
+   - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev valgrind
 +  - sudo pip install cpp-coveralls --use-mirrors
  
  before_script:
    - ./MakeMakefile
  
  script:
    - ./configure --prefix=/opt/rrdtool-master
 -  - make
 +  - make CFLAGS="-g -fprofile-arcs -ftest-coverage"
-   - ./tests/alltests
+   - make check
+   - make check TESTS_STYLE=valgrind
    - sudo make install
    - /opt/rrdtool-master/bin/rrdtool
    - /opt/rrdtool-master/share/rrdtool/examples/4charts.pl