diff options
author | onqtam <vik.kirilov@gmail.com> | 2022-01-10 15:40:50 +0300 |
---|---|---|
committer | onqtam <vik.kirilov@gmail.com> | 2022-01-10 17:09:01 +0300 |
commit | 443c707966e807d96f06f01e22492c2b5f0ee7d6 (patch) | |
tree | e8a0c5d02357da337c44b2897918f95a2d944d00 | |
parent | ae27c0f1f3a97c245875d7eb859f91c9236da4d7 (diff) |
cleanup of travis & appveyor mentions from repo
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | doc/markdown/features.md | 11 | ||||
-rw-r--r-- | doctest/doctest.h | 3 | ||||
-rw-r--r-- | doctest/parts/doctest_fwd.h | 3 | ||||
-rw-r--r-- | examples/all_features/CMakeLists.txt | 2 | ||||
-rw-r--r-- | scripts/cmake/common.cmake | 2 | ||||
-rw-r--r-- | scripts/random_dev_notes.md | 2 |
7 files changed, 10 insertions, 15 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 10dffa67..5616af33 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ If you're going to change something in the library itself - make sure you don't This framework has some design goals which must be kept. Make sure you have read the [**features and design goals**](doc/markdown/features.md) page. -If your changes also change the output of the library - you should also update the reference output for the tests or otherwise the CI builds (```travis``` and ```appveyor```) will fail when they compare the latest output to the outdated reference output (which is committed in the repository). To do this run CMake with the ```DOCTEST_TEST_MODE``` variable set to ```COLLECT``` (making the new reference output) and then run ```ctest``` and commit the changed (or newly created) ```.txt``` files in the ```test_output``` folders too. The default ```DOCTEST_TEST_MODE``` is ```COMPARE```. +If your changes also change the output of the library - you should also update the reference output for the tests or otherwise the CI builds will fail when they compare the latest output to the outdated reference output (which is committed in the repository). To do this run CMake with the ```DOCTEST_TEST_MODE``` variable set to ```COLLECT``` (making the new reference output) and then run ```ctest``` and commit the changed (or newly created) ```.txt``` files in the ```test_output``` folders too. The default ```DOCTEST_TEST_MODE``` is ```COMPARE```. Example: ```cmake -DDOCTEST_TEST_MODE=COLLECT path/to/sources && cmake --build . && ctest``` diff --git a/doc/markdown/features.md b/doc/markdown/features.md index 4f40f783..2fb2c880 100644 --- a/doc/markdown/features.md +++ b/doc/markdown/features.md @@ -24,18 +24,17 @@ **SOME OF THIS IS OUTDATED** - Standards compliant **C++11** code - should work with any **C++11** capable compiler (use tag [**1.2.9**](https://github.com/doctest/doctest/tree/1.2.9) for C++98 and older compilers) -- tested with **GCC**: **4.8**, **4.9**, **5**, **6**, **7**, **8**, **9**, **10** -- tested with **Clang**: **3.5**, **3.6**, **3.7**, **3.8**, **3.9**, **4**, **5**, **6**, **7**, **8**, **9** (XCode 6+) -- tested with **MSVC**: **2015**, **2017**, **2019** (also in 32 bit mode) -- per-commit tested on [**travis**](https://travis-ci.org/doctest/doctest) and [**appveyor**](https://ci.appveyor.com/project/doctest/doctest) CI services +- tested with **GCC**: **4.8**, **4.9**, **5**, **6**, **7**, **8**, **9**, **10**, **11** +- tested with **Clang**: **3.5**, **3.6**, **3.7**, **3.8**, **3.9**, **4**, **5**, **6**, **7**, **8**, **9**, **10**, **11**, **12**, **13** (XCode 10+) +- tested with **MSVC**: **2015**, **2017**, **2019**, **2022** (also in 32 bit mode) +- per-commit tested on [**GitHub Actions**](https://github.com/doctest/doctest/actions) - warnings as errors even on the most aggressive warning levels - see [**here**](../../scripts/cmake/common.cmake#L84) - statically analyzed on the CI - [**Cppcheck**](http://cppcheck.sourceforge.net/) / [**Clang-Tidy**](https://clang.llvm.org/extra/clang-tidy/) / [**Coverity Scan**](https://scan.coverity.com/) / [**OCLint**](http://oclint.org/) / [**Visual Studio Analyzer**](https://docs.microsoft.com/en-us/visualstudio/code-quality/analyzing-c-cpp-code-quality-by-using-code-analysis) - all tests have their output compared to reference output of a previous known good run - all tests built and ran in **Debug**/**Release** modes - all tests ran through **valgrind** under **Linux** (sadly [not under OSX](https://github.com/doctest/doctest/issues/11)) - all tests ran through **address**, **UB** and **thread** sanitizers under **Linux**/**OSX** - - tests are ran in more than **150** different configurations on UNIX (Linux + OSX) on **travis** CI - - tests are ran in a total of **14** different configurations on Windows on **appveyor** CI + - tests are ran in more than **300** different configurations on UNIX (Linux + OSX) & Windows ## Other features: diff --git a/doctest/doctest.h b/doctest/doctest.h index 6290d517..eeef2f4a 100644 --- a/doctest/doctest.h +++ b/doctest/doctest.h @@ -1324,8 +1324,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") , m_at(at) {} DOCTEST_NOINLINE operator Result() { -// this is needed only for MSVC 2015: -// https://ci.appveyor.com/project/doctest/doctest/builds/38181202 +// this is needed only for MSVC 2015 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4800) // 'int': forcing value to bool bool res = static_cast<bool>(lhs); DOCTEST_MSVC_SUPPRESS_WARNING_POP diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h index c347efae..71ddf341 100644 --- a/doctest/parts/doctest_fwd.h +++ b/doctest/parts/doctest_fwd.h @@ -1321,8 +1321,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") , m_at(at) {} DOCTEST_NOINLINE operator Result() { -// this is needed only for MSVC 2015: -// https://ci.appveyor.com/project/doctest/doctest/builds/38181202 +// this is needed only for MSVC 2015 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4800) // 'int': forcing value to bool bool res = static_cast<bool>(lhs); DOCTEST_MSVC_SUPPRESS_WARNING_POP diff --git a/examples/all_features/CMakeLists.txt b/examples/all_features/CMakeLists.txt index 5027f257..d8b3cfbe 100644 --- a/examples/all_features/CMakeLists.txt +++ b/examples/all_features/CMakeLists.txt @@ -54,7 +54,7 @@ endforeach() # add this separately since it shouldn't have output compared to reference output - due to concurrency # not adding it for MinGW since it crashes when using mingw-w64-x86_64-8.1.0-release-posix-seh-rt_v6-rev0 -# (also disabled for old XCode builds on travis where there is no thread_local support and this is defined in the build matrix) +# (also disabled for old XCode builds where there is no thread_local support and this is defined in the build matrix) if(NOT MINGW AND NOT DEFINED DOCTEST_THREAD_LOCAL) doctest_add_test(NO_OUTPUT NAME concurrency.cpp ${common_args} -sf=*concurrency.cpp -d) # duration: there is no output anyway endif() diff --git a/scripts/cmake/common.cmake b/scripts/cmake/common.cmake index ea9c6e6f..e7d50fda 100644 --- a/scripts/cmake/common.cmake +++ b/scripts/cmake/common.cmake @@ -183,7 +183,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compiler_flags(-Wno-c++98-compat-pedantic) add_compiler_flags(-Wno-c++98-compat-bind-to-temporary-copy) add_compiler_flags(-Wno-c++98-compat-local-type-template-args) - add_compiler_flags(-Qunused-arguments -fcolor-diagnostics) # needed for ccache integration on travis + add_compiler_flags(-Qunused-arguments -fcolor-diagnostics) # needed for ccache integration endif() if(MSVC) diff --git a/scripts/random_dev_notes.md b/scripts/random_dev_notes.md index f47b98b8..85a87c49 100644 --- a/scripts/random_dev_notes.md +++ b/scripts/random_dev_notes.md @@ -5,8 +5,6 @@ move down from /Wall to /W4 for Visual Studio... /Wall is absolutely unnecessary https://github.com/catchorg/Catch2/blob/master/docs/tostring.md#catchis_range-specialisation -https://blog.travis-ci.com/2018-10-11-windows-early-release - add in the faq about the compile errors with stream<<"array" - nikola goranov, also moving to catch undef/define stuffs - use vararg macro, also make the "moving from catch to doctest" easier to find, also this: https://stackoverflow.com/questions/35530850/how-to-require-a-semicolon-after-a-macro/52122660#52122660 |