Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Use EXPECT_FALSE instead of EXPECT_EQ(false, X)#752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
deanberris merged 21 commits intocpp-netlib:masterfromdeanberris:fix/gtest-failure
Apr 6, 2017
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
21 commits
Select commitHold shift + click to select a range
ea14831
Use EXPECT_FALSE instead of EXPECT_EQ(false, X)
deanberrisApr 6, 2017
a3c79e0
squash: fix response tests too
deanberrisApr 6, 2017
2300c60
squash: let make determine the number of jobs
deanberrisApr 6, 2017
0f42783
squash: use ccache for the build
deanberrisApr 6, 2017
9a1121d
squash: set the compiler version properly
deanberrisApr 6, 2017
ea626d6
squash: use clang-3.8 as test compiler
deanberrisApr 6, 2017
8ef8677
squash: exclude asan and tsan builds from g++ matrix
deanberrisApr 6, 2017
47d91b2
squash: do not use ${HOME}
deanberrisApr 6, 2017
dab4bd4
squash: remove cache until we can make it work
deanberrisApr 6, 2017
2dd328e
squash: try installing ccache from testing too
deanberrisApr 6, 2017
4289ca9
squash: fix link to c compiler
deanberrisApr 6, 2017
009e2d5
squash: still not use ccache
deanberrisApr 6, 2017
fcf669d
squash: remove ccache installation for now
deanberrisApr 6, 2017
5219b94
squash: use boost array/chrono for 1.55
deanberrisApr 6, 2017
d42f0b3
squash: try ccache again
deanberrisApr 6, 2017
a344712
squash: add proper boost.asio defines for supporting clang
deanberrisApr 6, 2017
9050af6
squash: fix travis config
deanberrisApr 6, 2017
1243a50
squash: script better
deanberrisApr 6, 2017
b6cd5c4
squash: add more boost.asio config options
deanberrisApr 6, 2017
5a39a86
squash: use boost thread v3
deanberrisApr 6, 2017
17cef53
squash: use libstdc++ explicitly on Linux when using clang
deanberrisApr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions.travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,40 +4,49 @@ compiler:
- g++
- clang
env:
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
-BOOST_VER=1.59.0BUILD_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.0BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
# - BOOST_VER=1.59.0BUILD_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:
# exclude:
# - compiler: g++
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
# - compiler: g++
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
cache:
- apt
- ccache
matrix:
exclude:
- compiler: g++
env: BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread" Uri_BUILD_TEST=OFF Uri_DISABLE_LIBCXX=YES
- compiler: g++
env: BOOST_VER=1.59.0 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?
# - compiler: g++
# 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}" = "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}
- pwd
- export CUR_DIR=`pwd`
- mkdir -p ${CUR_DIR}/bin
- if [ "${CC}" = "gcc" ]; then
export CXX=g++-4.9;
export CC=gcc-4.9;
fi
- if [ "${CC}" = "clang" ]; then
export CXX=clang++-3.8;
export CC=clang-3.8;
export CCACHE_CPP2=yes;
fi
before_script:
- echo ${CXX}
- "${CXX} --version"
cache:
directories:
- "${HOME}/${CC}-boost_${BOOST_VER//./_}"
- echo ${CC}
- "${CC} --version"
script:
- pwd
- sh -x build.sh
Expand All@@ -47,15 +56,17 @@ addons:
apt:
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
- clang-3.6
- gcc-4.9
- g++-4.9
- clang-3.8
- cmake
- cmake-data
notifications:
slack:
secure: Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=
14 changes: 13 additions & 1 deletionCMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,11 +97,16 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
# We want to link in C++11 mode in Clang too, but also set a high enough
# template depth for the template metaprogramming.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11")
set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -DBOOST_ASIO_HAS_STD_CHRONO -DBOOST_ASIO_HAS_STD_ARRAY -DBOOST_ASIO_HAS_STD_SHARED_PTR -DBOOST_ASIO_HAS_STD_ATOMIC -DBOOST_ASIO_HAS_VARIADIC_TEMPLATES -DBOOST_ASIO_HAS_MOVE -DBOOST_THREAD_VERSION=3")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Use libc++ only in OS X.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# Use libstdc++ for Linux.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++")
endif()
endif()

Expand DownExpand Up@@ -140,6 +145,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})
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ struct http_async_connection
connection_delegate_ptr;

http_async_connection(resolver_type& resolver, resolve_function resolve,
bool follow_redirect,int timeout,
bool follow_redirect,int64_t timeout,
bool remove_chunk_markers,
connection_delegate_ptr delegate)
: timeout_(timeout),
Expand DownExpand Up@@ -578,7 +578,7 @@ struct http_async_connection
}
}

int timeout_;
int64_t timeout_;
bool remove_chunk_markers_;
boost::asio::steady_timer timer_;
bool is_timedout_;
Expand Down
2 changes: 1 addition & 1 deletionbuild.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 -j8
make
make test
cd ..
10 changes: 5 additions & 5 deletionslibs/network/test/http/request_incremental_parser_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ TEST(IncrementalRequestParserTest, ParseMethod) {
p.reset();
std::tie(parsed_ok, result_range) =
p.parse_until(request_parser_type::method_done, invalid_http_method);
EXPECT_EQ(false,parsed_ok);
EXPECT_FALSE(parsed_ok);
parsed.assign(std::begin(result_range), std::end(result_range));
std::cout << "PARSED: " << parsed << " [state:" << p.state() << "] "
<< std::endl;
Expand All@@ -68,7 +68,7 @@ TEST(IncrementalRequestParserTest, ParseURI) {
std::string valid_http_request = "GET / HTTP/1.1\r\n";
std::tie(parsed_ok, result_range) =
p.parse_until(request_parser_type::uri_done, valid_http_request);
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() << "] "
Expand All@@ -78,7 +78,7 @@ TEST(IncrementalRequestParserTest, ParseURI) {
p.reset();
std::tie(parsed_ok, result_range) =
p.parse_until(request_parser_type::uri_done, invalid_http_request);
EXPECT_EQ(false,parsed_ok);
EXPECT_FALSE(parsed_ok);
parsed.assign(std::begin(result_range), std::end(result_range));
std::cout << "PARSED: " << parsed << " [state:" << p.state() << "] "
<< std::endl;
Expand All@@ -104,7 +104,7 @@ TEST(IncrementalRequestParserTest, ParseHTTPVersion) {
p.reset();
std::tie(parsed_ok, result_range) =
p.parse_until(request_parser_type::version_done, invalid_http_request);
EXPECT_EQ(false,parsed_ok);
EXPECT_FALSE(parsed_ok);
parsed.assign(std::begin(result_range), std::end(result_range));
std::cout << "PARSED: " << parsed << " [state:" << p.state() << "] "
<< std::endl;
Expand All@@ -121,7 +121,7 @@ TEST(IncrementalRequestParserTest, ParseHTTPHeaders) {
"GET / HTTP/1.1\r\nHost: cpp-netlib.org\r\n\r\n";
std::tie(parsed_ok, result_range) =
p.parse_until(request_parser_type::headers_done, valid_http_request);
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() << "] "
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp