squash: use ccache for the build

cpp-netlib · deanberris · Apr 6, 2017 · Apr 6, 2017 · Apr 6, 2017 · Apr 6, 2017
commit 0f42783b433408e0f587f4342f58b72b9967c52a
diff --git a/.travis.yml b/.travis.yml
@@ -4,17 +4,17 @@ compiler:
 - g++
 - clang
 env:
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
 # Support the sanitizers in clang only
-# - BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
-# - BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread" Uri_BUILD_TEST=OFF Uri_DISABLE_LIBCXX=YES
+- BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address" Uri_BUILD_TEST=OFF Uri_DISABLE_LIBCXX=YES
 # TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
 #- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
 # matrix:
@@ -28,16 +28,14 @@ env:
 #      env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
 install:
 - mkdir -p ${HOME}/bin
-- if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.8` ${HOME}/bin/g++;
-  ln -s `which gcc-4.8` ${HOME}/bin/gcc; fi
+- if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.9` ${HOME}/bin/g++;
+  ln -s `which gcc-4.9` ${HOME}/bin/gcc; fi
 - if [ "${CC}" = "clang" ]; then export TOOLSET="clang"; ln -s `which clang-3.6` ${HOME}/bin/clang;
   ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
 - export BOOST_VERSION=${BOOST_VER//./_}
 - export PATH=${HOME}/bin:${PATH}
 - "${CXX} --version"
-cache:
-  directories:
-  - "${HOME}/${CC}-boost_${BOOST_VER//./_}"
+cache: ccache
 script:
 - pwd
 - sh -x build.sh
@@ -48,14 +46,18 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise-3.6
+      - llvm-toolchain-precise-3.8
       - kalakris-cmake
       - boost-latest
+      - george-edison55-precise-backports
     packages:
       - libboost1.55-all-dev
-      - gcc-4.8
-      - g++-4.8
+      - gcc-4.9
+      - g++-4.9
       - clang-3.6
+      - clang-3.8
       - cmake
+      - cmake-data
 notifications:
   slack:
     secure: Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,6 +140,13 @@ if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif()
 
+# See whether we can find the ccache program -- if we can, then use it for the build.
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
 enable_testing()
 
 install(DIRECTORY boost DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

diff --git a/build.sh b/build.sh
@@ -13,6 +13,6 @@ cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
   -DUri_DISABLE_LIBCXX=$Uri_DISABLE_LIBCXX \
   -DCMAKE_CXX_FLAGS="-std=c++11 ${CMAKE_CXX_FLAGS}" \
   ..
-make -j
+make
 make test
 cd ..
diff --git a/libs/network/test/http/response_incremental_parser_test.cpp b/libs/network/test/http/response_incremental_parser_test.cpp
@@ -82,15 +82,15 @@ TEST(IncrementalResponseParserTest, ParseHTTPVersion) {
   std::string valid_http_version = "HTTP/1.0 ";
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_version_done, valid_http_version);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_FALSE(boost::empty(result_range));
   std::string parsed(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
   p.reset();
   valid_http_version = "HTTP/1.1 ";
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_version_done, valid_http_version);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_FALSE(boost::empty(result_range));
   parsed.assign(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
@@ -109,7 +109,7 @@ TEST(IncrementalResponseParserTest, ParseHTTPVersion) {
   parsed_ok = logic::indeterminate;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_version_done, valid_http_version);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed.assign(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
@@ -137,7 +137,7 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseStatus) {
   range_type result_range;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_status_done, valid_status);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   std::string parsed =
       std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
@@ -153,7 +153,7 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseStatus) {
   valid_status = "200" + TypeParam::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_status_done, valid_status);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
@@ -171,7 +171,7 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseStatusMessage) {
   range_type result_range;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_status_message_done, valid_status_message);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   std::string parsed =
       std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
@@ -180,31 +180,31 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseStatusMessage) {
   valid_status_message = "OK" + TypeParam::literal;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_status_message_done, valid_status_message);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 
   p.reset(response_parser_type::http_status_done);
   valid_status_message = "Internal Server Error" + TypeParam::literal;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_status_message_done, valid_status_message);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 
   p.reset(response_parser_type::http_status_done);
   valid_status_message = TypeParam::literal;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_status_message_done, valid_status_message);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 
   p.reset(response_parser_type::http_status_done);
   valid_status_message = "한글메시지" + TypeParam::literal;
   std::tie(parsed_ok, result_range) = p.parse_until(
       response_parser_type::http_status_message_done, valid_status_message);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
@@ -224,7 +224,7 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseHTTPHeaders) {
   range_type result_range;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   std::string parsed1 =
       std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
@@ -233,15 +233,15 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseHTTPHeaders) {
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   std::string parsed2 =
       std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 
   p.reset(response_parser_type::http_status_message_done);
@@ -250,22 +250,22 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseHTTPHeaders) {
                   eol::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed1 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
   p.reset(response_parser_type::http_status_message_done);
   end = valid_headers.end();
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed2 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 
   p.reset(response_parser_type::http_status_message_done);
@@ -274,45 +274,45 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseHTTPHeaders) {
                   eol::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed1 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
   p.reset(response_parser_type::http_status_message_done);
   end = valid_headers.end();
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed2 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 
   p.reset(response_parser_type::http_status_message_done);
   valid_headers = "Server: " + eol::literal + "Content-Type: application/json" +
                   eol::literal + eol::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed1 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
   p.reset(response_parser_type::http_status_message_done);
   end = valid_headers.end();
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed2 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 
   p.reset(response_parser_type::http_status_message_done);
@@ -321,44 +321,44 @@ TYPED_TEST(IncrementalResponseEOLTypeTest, ParseHTTPHeaders) {
                   eol::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed1 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
   p.reset(response_parser_type::http_status_message_done);
   end = valid_headers.end();
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed2 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 
   p.reset(response_parser_type::http_status_message_done);
   valid_headers = "Content-Type: text/html;" + eol::literal + "charset=utf-8" +
                   eol::literal + eol::literal;
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed1 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
   p.reset(response_parser_type::http_status_message_done);
   end = valid_headers.end();
   valid_headers.assign(std::end(result_range), end);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_header_line_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   parsed2 = std::string(std::begin(result_range), std::end(result_range));
   std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
   valid_headers.assign(std::end(result_range), end);
   p.reset(response_parser_type::http_status_message_done);
   std::tie(parsed_ok, result_range) =
       p.parse_until(response_parser_type::http_headers_done, valid_headers);
-  EXPECT_EQ(true, parsed_ok);
+  EXPECT_TRUE(parsed_ok);
   EXPECT_NE(parsed1, parsed2);
 }