Merge pull request #65 from torbjoernk/feature/travis-different-boost

travis: switch to other Boost PPA and test 1.53 and 1.55

Author: memmett

.travis.yml

@@ -1,6 +1,8 @@
 language:
   - cpp
 
+cache: apt
+
 notifications:
   email:
     on_success: change  # default: change
@@ -10,26 +12,35 @@ notifications:
 #  -> https://github.com/travis-ci/travis-ci/issues/1519
 env:
   matrix:
-    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=clang++
-    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=g++
-    - CMAKE_BUILD_TYPE="Release" WITH_MPI=ON CXX=g++
-    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=clang++
-    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=g++
-    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=ON CXX=g++
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=clang++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=g++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=ON CXX=g++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=clang++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=g++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=ON CXX=g++ BOOST_VERSION=1.53
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=clang++ BOOST_VERSION=1.55
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=OFF CXX=g++ BOOST_VERSION=1.55
+    - CMAKE_BUILD_TYPE="Release" WITH_MPI=ON CXX=g++ BOOST_VERSION=1.55
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=clang++ BOOST_VERSION=1.55
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=OFF CXX=g++ BOOST_VERSION=1.55
+    - CMAKE_BUILD_TYPE="Debug" WITH_MPI=ON CXX=g++ BOOST_VERSION=1.55
 
 before_install:
-  - sudo add-apt-repository ppa:apokluda/boost1.53 --yes
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes # libstdc++-4.8
-  - if [ "${CXX}" == "clang++" ]; then sudo add-apt-repository --yes ppa:h-rayflood/llvm; fi  # clang++-3.2
+  # boost packages
+  - if [ "${BOOST_VERSION}" == "1.53" ]; then sudo add-apt-repository ppa:apokluda/boost1.53 --yes; fi
+  - if [ "${BOOST_VERSION}" == "1.55" ]; then sudo add-apt-repository ppa:boost-latest/ppa --yes; fi
+  # libstdc++-4.8
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes
+  # clang++-3.2
+  - if [ "${CXX}" == "clang++" ]; then sudo add-apt-repository --yes ppa:h-rayflood/llvm; fi
   - sudo apt-get update
 
-
 install:
   # note: clang needs g++-4.8 it for libstdc++ update
   - if [ "${CXX}" == "clang++" ]; then sudo apt-get -qq install clang-3.2; fi
   - if [ "${WITH_MPI}" == "ON" ]; then sudo apt-get -qq install mpich2 libmpich2-dev; fi
-  - sudo apt-get install g++-4.8 # clang need it for libstdc++ update
-  - sudo apt-get install libboost1.53-all-dev libfftw3-3 libfftw3-dev
+  - sudo apt-get install g++-4.8
+  - sudo apt-get install "libboost${BOOST_VERSION}-all-dev" libfftw3-3 libfftw3-dev
 
 before_script:
   # update compilers
@@ -41,5 +52,5 @@ script:
   - cd build
   - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dpfasst_WITH_MPI=${WITH_MPI} -Dpfasst_DISABLE_LIBCXX=ON -Dpfasst_BUILD_TESTS=ON -Dpfasst_BUILD_EXAMPLES=ON ..
   - make
-  - make test
+  - make test ARGS="-V"
   - make run_example_all

tests/examples/advection_diffusion/test_mpi_advection_diffusion.cpp

@@ -10,13 +10,14 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+using namespace ::testing;
+
 #include <mpi.h>
 
 #define PFASST_UNIT_TESTING
 #include "../examples/advection_diffusion/mpi_pfasst.cpp"
 #undef PFASST_UNIT_TESTING
 
-
 using namespace std;
 
 TEST(ErrorTest, MPIPFASST)
@@ -34,7 +35,7 @@ TEST(ErrorTest, MPIPFASST)
   vector<double> ex = { 1.1168e-13, 4.8849e-13, 5.3268e-13, 2.3059e-12 };
   for (auto& x: errors) {
     if (get_iter(x) == max_iter) {
-      EXPECT_NEAR(get_error(x), ex[get_step(x)], 1e-14);
+      EXPECT_NEAR(get_error(x), ex[get_step(x)], *max_element(ex.cbegin(), ex.cend()));
     }
   }
 }
@@ -43,7 +44,9 @@ int main(int argc, char** argv)
 {
   testing::InitGoogleTest(&argc, argv);
   MPI_Init(&argc, &argv);
-  auto result = RUN_ALL_TESTS();
+  int result = 1, max_result;  // GTest return value 1 (failure), 0 (success)
+  result = RUN_ALL_TESTS();
+  MPI_Allreduce(&result, &max_result, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
   MPI_Finalize();
-  return result;
+  return max_result;
 }