From e0ed62e3084b321a8c22ceaf5f677f8ed14fd719 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 11:29:36 +0300 Subject: [PATCH 1/9] Running valgrind in a different build in order to detect memory leaks. --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cf85c8..0177dc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,24 @@ compiler: matrix: include: - compiler: gcc - env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes + env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=no + - compiler: gcc + env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=yes install: - sudo apt-get update -qq - sudo apt-get install -qq automake pkg-config build-essential libtool automake autoconf m4 gnulib - sudo apt-get install -qq check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 - sudo apt-get install -qq graphviz-dev graphviz - - if [ x$COVERALLS == xyes ]; then sudo pip install cpp-coveralls --use-mirror; fi + - if [ x$COVERALLS == xyes ]; then sudo pip install cpp-coveralls; fi + - if [x$VALGRIND == xyes ]; then sudo apt-get install valgrind; fi script: - ./autogen.sh - ./configure $CONFIGURE_OPTION - make - - make check + - if [x$VALGRIND == xyes ]; make check 2>&1 > /dev/null; else; make check; fi + - if [x$VALGRIND == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi after_success: - if [ x$COVERALLS == xyes ]; then coveralls ; fi From 1c8c63e0a56b2ea1c835c79dc73c759880264353 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 11:44:24 +0300 Subject: [PATCH 2/9] Fixed a bash syntax error. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0177dc4..296f3eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - ./autogen.sh - ./configure $CONFIGURE_OPTION - make - - if [x$VALGRIND == xyes ]; make check 2>&1 > /dev/null; else; make check; fi + - if [x$VALGRIND == xyes ]; make check 2>&1 > /dev/null; else make check; fi - if [x$VALGRIND == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi after_success: From 86cdf3800ed4efab6c7c71af39283763d7499e51 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 12:00:18 +0300 Subject: [PATCH 3/9] Fixed bash syntax errors. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 296f3eb..8a15872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,15 +15,15 @@ install: - sudo apt-get install -qq automake pkg-config build-essential libtool automake autoconf m4 gnulib - sudo apt-get install -qq check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 - sudo apt-get install -qq graphviz-dev graphviz - - if [ x$COVERALLS == xyes ]; then sudo pip install cpp-coveralls; fi - - if [x$VALGRIND == xyes ]; then sudo apt-get install valgrind; fi + - if [ "x$COVERALLS" == xyes ]; then sudo pip install cpp-coveralls; fi + - if[ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi script: - ./autogen.sh - ./configure $CONFIGURE_OPTION - make - - if [x$VALGRIND == xyes ]; make check 2>&1 > /dev/null; else make check; fi - - if [x$VALGRIND == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi + - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check; fi + - if [ "x$VALGRIND" == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi after_success: - if [ x$COVERALLS == xyes ]; then coveralls ; fi From cd4d4647deb572b4c60d626296c356135db4dfd8 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 12:02:52 +0300 Subject: [PATCH 4/9] Bash is being touchy. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8a15872..d27cbd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: - sudo apt-get install -qq check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 - sudo apt-get install -qq graphviz-dev graphviz - if [ "x$COVERALLS" == xyes ]; then sudo pip install cpp-coveralls; fi - - if[ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi + - if [ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi script: - ./autogen.sh From 27531aac5633a5aa20fbe481b7378ec69d47cb93 Mon Sep 17 00:00:00 2001 From: c9s Date: Wed, 21 May 2014 18:36:52 +0800 Subject: [PATCH 5/9] remove benchmark result with debug flags --- tests/bench_str.csv | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/bench_str.csv b/tests/bench_str.csv index 6a7117a..61887e0 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -438,11 +438,6 @@ 1400607695,13583203.56 1400607698,13630627.45 1400607700,13972490.11 -1400655532,6648299.49 -1400655542,6685928.45 1400659046,19754150.71 -1400666823,6406965.25 -1400666950,6684744.95 -1400667091,6771202.47 -1400667800,6695271.95 1400668268,13174604.57 +1400668574,13632260.72 From 4e702e92fb5f48c9f5bcc616ab700b173f4deee1 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 14:06:23 +0300 Subject: [PATCH 6/9] Installed the compiled shared libraries globally. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d27cbd1..067ee3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ script: - ./autogen.sh - ./configure $CONFIGURE_OPTION - make + - sudo make install - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check; fi - if [ "x$VALGRIND" == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi From 08a127d30c46ace41a40267fab87fbd03279b7b9 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 14:19:13 +0300 Subject: [PATCH 7/9] Making sure that the .so files are on the ldconfig path. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 067ee3a..c719ba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ install: - if [ "x$COVERALLS" == xyes ]; then sudo pip install cpp-coveralls; fi - if [ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi +before_script: + - echo "/usr/local/lib/" >> /etc/ld.so.conf + - ldconfig script: - ./autogen.sh - ./configure $CONFIGURE_OPTION From a23c6c487505e5e0cf5fdd4cef5d6fdba8c6fd2c Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 14:22:24 +0300 Subject: [PATCH 8/9] Forgot to sudo. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c719ba5..7031441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ install: - if [ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi before_script: - - echo "/usr/local/lib/" >> /etc/ld.so.conf - - ldconfig + - sudo echo "/usr/local/lib/" >> /etc/ld.so.conf + - sudo ldconfig script: - ./autogen.sh - ./configure $CONFIGURE_OPTION From 5dbef0cf24b299cec1c1e802c1e093d1293d4d5c Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 21 May 2014 14:30:06 +0300 Subject: [PATCH 9/9] Seriously travis? sudo won't give me permissions?? --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7031441..c7a1ad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ matrix: - compiler: gcc env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=no - compiler: gcc - env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=yes + env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=yes LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/ install: - sudo apt-get update -qq @@ -19,7 +19,6 @@ install: - if [ "x$VALGRIND" == xyes ]; then sudo apt-get install valgrind; fi before_script: - - sudo echo "/usr/local/lib/" >> /etc/ld.so.conf - sudo ldconfig script: - ./autogen.sh