Updated valgrind version.

Author: redboltz

.travis.yml

@@ -18,7 +18,8 @@ install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y bzip2; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y libc6-dbg; fi
   - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
-  - wget http://valgrind.org/downloads/valgrind-3.10.1.tar.bz2 && tar xjf valgrind-3.10.1.tar.bz2 && cd valgrind-3.10.1 && ./configure && make && sudo make install && cd ..
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install valgrind; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure && make && sudo make install && cd ..; fi
 
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew unlink boost; fi
   - if [ "$BOOST" == "boost" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.zip && unzip -q boost_1_58_0.zip && cd boost_1_58_0 && ./bootstrap.sh && ./b2 --with-timer --with-chrono address-model="$ARCH" > /dev/null && sudo ./b2 --with-timer --with-chrono address-model="$ARCH" install > /dev/null && cd ..; fi
@@ -32,19 +33,15 @@ before_script:
 matrix:
   include:
     - os: osx
-      osx_image: beta-xcode6.2
       compiler: clang
       env: ACTION="ci/build_cmake.sh"  VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib"   BOOST="boost" BOOST_INC="/usr/local/boost"              CHAR_SIGN="unsigned" API_VERSION="1"
     - os: osx
-      osx_image: beta-xcode6.2
       compiler: clang
       env:  ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib"   BOOST="boost" BOOST_INC="/usr/local/boost"              CHAR_SIGN="signed"   API_VERSION="2"
     - os: osx
-      osx_image: beta-xcode6.2
       compiler: clang
       env: ACTION="ci/build_cmake.sh"  VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib"   BOOST=""      BOOST_INC=""                              CHAR_SIGN="signed"   API_VERSION="2"
     - os: osx
-      osx_image: beta-xcode6.2
       compiler: clang
       env: ACTION="ci/build_cmake.sh"  VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib"   BOOST=""      BOOST_INC=""                              CHAR_SIGN="unsigned" API_VERSION="2"
     - os: linux

ci/build_cmake.sh

@@ -83,7 +83,7 @@ then
     exit $ret
 fi
 
-if [ "$2" != "32" ]
+if [ "$2" != "32" ] && [ `uname` = "Linux" ]
 then
     ctest -T memcheck | tee memcheck.log