3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update version string to mention Catch2

This commit is contained in:
Martin Hořeňovský 2022-01-27 11:21:43 +01:00
parent 5121660e7f
commit dc86d51af2
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/catch2/catch_session.cpp
View File

@ -173,7 +173,7 @@ namespace Catch {
void Session::showHelp() const {
Catch::cout()
<< "\nCatch v" << libraryVersion() << '\n'
<< "\nCatch2 v" << libraryVersion() << '\n'
<< m_cli << '\n'
<< "For more detailed usage please see the project docs\n\n" << std::flush;
}
@ -181,7 +181,7 @@ namespace Catch {
Catch::cout()
<< std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
<< std::left << std::setw(16) << "category: " << "testframework\n"
<< std::left << std::setw(16) << "framework: " << "Catch Test\n"
<< std::left << std::setw(16) << "framework: " << "Catch2\n"
<< std::left << std::setw(16) << "version: " << libraryVersion() << '\n' << std::flush;
}

2
src/catch2/reporters/catch_reporter_console.cpp
View File

@ -517,7 +517,7 @@ void ConsoleReporter::lazyPrintRunInfo() {
m_stream << '\n' << lineOfChars('~') << '\n';
Colour colour(Colour::SecondaryText);
m_stream << currentTestRunInfo.name
<< " is a Catch v" << libraryVersion() << " host application.\n"
<< " is a Catch2 v" << libraryVersion() << " host application.\n"
<< "Run with -? for options\n\n";
m_stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";

2
tests/CMakeLists.txt
View File

@ -304,7 +304,7 @@ add_test(NAME RegressionCheck-1670 COMMAND $<TARGET_FILE:SelfTest> "#1670 regres
set_tests_properties(RegressionCheck-1670 PROPERTIES PASS_REGULAR_EXPRESSION "Passed 1 test case with 2 assertions.")
add_test(NAME VersionCheck COMMAND $<TARGET_FILE:SelfTest> -h)
set_tests_properties(VersionCheck PROPERTIES PASS_REGULAR_EXPRESSION "Catch v${PROJECT_VERSION}")
set_tests_properties(VersionCheck PROPERTIES PASS_REGULAR_EXPRESSION "Catch2 v${PROJECT_VERSION}")
add_test(NAME LibIdentityTest COMMAND $<TARGET_FILE:SelfTest> --libidentify)
set_tests_properties(LibIdentityTest PROPERTIES PASS_REGULAR_EXPRESSION "description: A Catch2 test executable")

4
tools/scripts/approvalTests.py
View File

@ -35,7 +35,7 @@ durationsParser = re.compile(r' time="[0-9]*\.[0-9]*"')
junitDurationsParser = re.compile(r' time="[0-9]+\.[0-9]{3}"')
durationParser = re.compile(r''' duration=['"][0-9]+['"]''')
timestampsParser = re.compile(r'\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}Z')
versionParser = re.compile(r'Catch v[0-9]+\.[0-9]+\.[0-9]+(-\w*\.[0-9]+)?')
versionParser = re.compile(r'Catch2 v[0-9]+\.[0-9]+\.[0-9]+(-\w*\.[0-9]+)?')
nullParser = re.compile(r'\b(__null|nullptr)\b')
exeNameParser = re.compile(r'''
\b
@ -140,7 +140,7 @@ def filterLine(line, isCompact):
# strip out the test order number in TAP to avoid massive diffs for every change
line = tapTestNumParser.sub("\g<1> {test-number} -", line)
# strip Catch version number
# strip Catch2 version number
line = versionParser.sub("<version>", line)
# replace *null* with 0