Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

.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
-      os: linux   
-      addons: *clang70
-
-    - env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off
-      os: linux
-      addons: *clang70
+    - env: CLANG_VERSION=7 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off
+      dist: bionic      
 
+    - env: CLANG_VERSION=7 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off
+      dist: bionic
+      
       # osx
     - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
       os: osx

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<int> 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);
-}
+}