From bd2fe64bf10337146bf759c486d3c8240bfcdc41 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Sat, 21 Sep 2019 15:24:37 +0300 Subject: [PATCH 1/5] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd26b617..82ad7f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,11 +67,11 @@ matrix: # Test clang-7.0: C++11, Build=Debug, ASAN=On - env: CLANG_VERSION=7.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off - os: linux + dist: bionic addons: *clang70 - env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off - os: linux + dist: bionic addons: *clang70 # osx From efd0dbe5c2df93b629e781ec2d6a9a8d4a1cb737 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Sat, 21 Sep 2019 15:30:29 +0300 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82ad7f62..27529c0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ matrix: before_script: - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi + - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXX="clang++" CC="clang"; fi - which $CXX - which $CC From 647470f3ae8c6d01e78c2944b5435a05167382ca Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Sat, 21 Sep 2019 15:33:03 +0300 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27529c0a..fb99737f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,14 +66,12 @@ matrix: addons: *clang35 # Test clang-7.0: C++11, Build=Debug, ASAN=On - - env: CLANG_VERSION=7.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off - dist: bionic - addons: *clang70 + - env: CLANG_VERSION=7 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off + dist: bionic - - env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off + - env: CLANG_VERSION=7 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off dist: bionic - addons: *clang70 - + # osx - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off os: osx From 1f0513cf4e331928a80d7c98994aff777ec5a0f9 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Sat, 21 Sep 2019 15:35:22 +0300 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb99737f..b3137c6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ matrix: before_script: - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi + - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXX="clang++" CC="clang"; fi - which $CXX - which $CC From 10578ff08c276584bcbb0ec5a7486bda4113175e Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Sat, 21 Sep 2019 15:49:54 +0300 Subject: [PATCH 5/5] Update test_mpmc_q.cpp --- tests/test_mpmc_q.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_mpmc_q.cpp b/tests/test_mpmc_q.cpp index 19a188d8..888240fd 100644 --- a/tests/test_mpmc_q.cpp +++ b/tests/test_mpmc_q.cpp @@ -29,7 +29,7 @@ TEST_CASE("dequeue-empty-wait", "[mpmc_blocking_q]") size_t q_size = 100; milliseconds wait_ms(250); - milliseconds tolerance_wait(50); + milliseconds tolerance_wait(250); spdlog::details::mpmc_blocking_queue q(q_size); int popped_item; @@ -104,4 +104,4 @@ TEST_CASE("full_queue", "[mpmc_blocking_q]") int item = -1; q.dequeue_for(item, milliseconds(0)); REQUIRE(item == 123456); -} \ No newline at end of file +}