From e5c9a58d66ff0780e956b5447573af9d6b9b2ca3 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Thu, 19 Mar 2020 12:31:22 +0000 Subject: [PATCH] Fixed typo in "benchmark name" column width calculation. Closes #1885. --- include/reporters/catch_reporter_console.cpp | 2 +- projects/ExtraTests/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/reporters/catch_reporter_console.cpp b/include/reporters/catch_reporter_console.cpp index 706f93f870..0fa399d586 100644 --- a/include/reporters/catch_reporter_console.cpp +++ b/include/reporters/catch_reporter_console.cpp @@ -362,7 +362,7 @@ ConsoleReporter::ConsoleReporter(ReporterConfig const& config) else { return{ - { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left }, + { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left }, { "samples mean std dev", 14, ColumnInfo::Right }, { "iterations low mean low std dev", 14, ColumnInfo::Right }, { "estimated high mean high std dev", 14, ColumnInfo::Right } diff --git a/projects/ExtraTests/CMakeLists.txt b/projects/ExtraTests/CMakeLists.txt index 0e514d96fc..c8c975c00d 100644 --- a/projects/ExtraTests/CMakeLists.txt +++ b/projects/ExtraTests/CMakeLists.txt @@ -123,7 +123,7 @@ add_test(NAME BenchmarkingMacros COMMAND BenchmarkingMacros -r console -s) set_tests_properties( BenchmarkingMacros PROPERTIES - PASS_REGULAR_EXPRESSION "benchmark name samples iterations estimated" + PASS_REGULAR_EXPRESSION "benchmark name[\\r\\n\\t ]+samples[\\r\\n\\t ]+iterations[\\r\\n\\t ]+estimated" ) # This test touches windows.h, so it should only be compiled under msvc