Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-01-27 11:21:43 +0100
committerMartin Hořeňovský2022-01-27 20:15:05 +0100
commitdc86d51af2a7e37bf19bb5b9cfc510ebc47d7573 (patch)
tree3c23389217fc1a21098ee2d7ac65846bc5738f14
parent5121660e7ff38e171ac01ded949502a5dba7570f (diff)
downloadcatch3-dc86d51af2a7e37bf19bb5b9cfc510ebc47d7573.tar.gz
Update version string to mention Catch2
-rw-r--r--src/catch2/catch_session.cpp4
-rw-r--r--src/catch2/reporters/catch_reporter_console.cpp2
-rw-r--r--tests/CMakeLists.txt2
-rwxr-xr-xtools/scripts/approvalTests.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 54b119b0..912cd850 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -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;
}
diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp
index 0d3a5202..d5dd89c5 100644
--- a/src/catch2/reporters/catch_reporter_console.cpp
+++ b/src/catch2/reporters/catch_reporter_console.cpp
@@ -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";
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2e8d0a6b..d78308ed 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -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")
diff --git a/tools/scripts/approvalTests.py b/tools/scripts/approvalTests.py
index 1057c4ad..59b00d01 100755
--- a/tools/scripts/approvalTests.py
+++ b/tools/scripts/approvalTests.py
@@ -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