version 2.4.0

Shiffted · Jun 27, 2020 · 7053110 · 7053110
1 parent 1fb630b
commit 7053110
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/503/badge)](https://bestpractices.coreinfrastructure.org/projects/503)
 [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/onqtam/doctest.svg)](https://lgtm.com/projects/g/onqtam/doctest/context:cpp)
 [![Join the chat at https://gitter.im/onqtam/doctest](https://badges.gitter.im/onqtam/doctest.svg)](https://gitter.im/onqtam/doctest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/naTIsMXeA4M4NUOE)
+[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/nJIibfbivG7BG7r1)
 <!--
 [![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/)
 [![documentation](https://img.shields.io/badge/documentation%20%20-online-blue.svg)](https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference)

diff --git a/doc/html_generated/build-systems.html b/doc/html_generated/build-systems.html
@@ -79,6 +79,7 @@
 - conan
     - https://bintray.com/bincrafters/public-conan/doctest:bincrafters
     - https://bintray.com/mmha/conan/doctest%3Ammha
+- Homebrew (`brew install doctest`)
 
 ---
 

diff --git a/doc/html_generated/reporters.html b/doc/html_generated/reporters.html
@@ -10,6 +10,7 @@
 You can list all registered reporters/listeners with ```--list-reporters```. There are a few implemented reporters in the framework:
 - ```console``` - streaming - writes normal lines of text with coloring if a capable terminal is detected
 - ```xml``` - streaming - writes in xml format tailored to doctest
+- ```junit``` - buffering - writes in JUnit-compatible xml - for more information look [here](https://github.com/onqtam/doctest/issues/318) and [here](https://github.com/onqtam/doctest/issues/376).
 
 Streaming means that results are delivered progressively and not at the end of the test run.
 

diff --git a/doc/html_generated/roadmap.html b/doc/html_generated/roadmap.html
@@ -12,11 +12,12 @@
 
 Planned features for future releases - order changes constantly... Also look through the [**issues**](https://github.com/onqtam/doctest/issues).
 
-### For 2.4:
+### For 2.5:
 
 - https://github.com/onqtam/doctest/issues/208
 - reporters:
-    - xUnit/junit/TeamCity reporter - perhaps related: https://github.com/ujiro99/doctest-junit-report
+    - ability to redirect the stdout/stderr from test cases and capture it - like Catch does it
+    - xUnit/TeamCity reporter
     - compact reporter
     - options
         - absolutely no output on success (AKA quiet mode)
@@ -50,7 +51,7 @@
         - https://www.jetbrains.com/clion/features/unit-testing.html
         - https://blog.jetbrains.com/clion/2017/03/clion-2017-1-released/#catch
 
-### For 2.5:
+### For 2.6:
 
 - log levels - like in [boost test](http://www.boost.org/doc/libs/1_63_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/log_level.html)
 - running tests a [few times](https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.html#repeating-the-tests)

diff --git a/doctest/doctest.h b/doctest/doctest.h
@@ -47,9 +47,9 @@
 // =================================================================================================
 
 #define DOCTEST_VERSION_MAJOR 2
-#define DOCTEST_VERSION_MINOR 3
-#define DOCTEST_VERSION_PATCH 8
-#define DOCTEST_VERSION_STR "2.3.8"
+#define DOCTEST_VERSION_MINOR 4
+#define DOCTEST_VERSION_PATCH 0
+#define DOCTEST_VERSION_STR "2.4.0"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)

diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h
@@ -44,9 +44,9 @@
 // =================================================================================================
 
 #define DOCTEST_VERSION_MAJOR 2
-#define DOCTEST_VERSION_MINOR 3
-#define DOCTEST_VERSION_PATCH 8
-#define DOCTEST_VERSION_STR "2.3.8"
+#define DOCTEST_VERSION_MINOR 4
+#define DOCTEST_VERSION_PATCH 0
+#define DOCTEST_VERSION_STR "2.4.0"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)

diff --git a/examples/all_features/test_output/version.txt b/examples/all_features/test_output/version.txt
@@ -1 +1 @@
-[doctest] doctest version is "2.3.8"
+[doctest] doctest version is "2.4.0"
diff --git a/examples/all_features/test_output/version_xml.txt b/examples/all_features/test_output/version_xml.txt
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctest binary="all_features" version="2.3.8">
+<doctest binary="all_features" version="2.4.0">
   <Options order_by="file" rand_seed="324" first="0" last="4294967295" abort_after="0" subcase_filter_levels="2147483647" case_sensitive="false" no_throw="false" no_skip="false"/>
 </doctest>
diff --git a/meson.build b/meson.build
@@ -1,2 +1,2 @@
-project('doctest', ['cpp'], version: '2.3.8', meson_version:'>=0.50')
+project('doctest', ['cpp'], version: '2.4.0', meson_version:'>=0.50')
 doctest_dep = declare_dependency(include_directories: include_directories('doctest'))
diff --git a/scripts/version.txt b/scripts/version.txt
@@ -1 +1 @@
-2.3.8
+2.4.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ @@
     - conan
         - https://bintray.com/bincrafters/public-conan/doctest:bincrafters
         - https://bintray.com/mmha/conan/doctest%3Ammha
+    - Homebrew (`brew install doctest`)
     ---
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[doctest] doctest version is "2.3.8"
		[doctest] doctest version is "2.4.0"