Merge branch 'v1.x' into v1.x

2019-06-28 08:07:15 +03:00
parent a13981ffe4 94c2810b0a
commit dc054c3f8a
23 changed files with 210 additions and 69 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,7 +14,8 @@ set(SPDLOG_UTESTS_SOURCES
    test_mpmc_q.cpp
    test_sink.h
    test_fmt_helper.cpp
-    test_stdout_api.cpp)
+  	test_stdout_api.cpp
+    test_dup_filter.cpp)

 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
 enable_testing()