diff options
| author | Daniel Feist | 2022-04-23 23:14:49 +0200 |
|---|---|---|
| committer | GitHub | 2022-04-23 23:14:49 +0200 |
| commit | 291b35b389b8e6d7b560cf7e43b6c72c4b73e522 (patch) | |
| tree | d2dc107dbe6d2d5965ce63941b7d4a2fe123bd07 /src | |
| parent | f526ff0fc37ae00ff2c0dc8f6550bf8209c30afc (diff) | |
| download | catch3-291b35b389b8e6d7b560cf7e43b6c72c4b73e522.tar.gz | |
Added --skip-benchmarks command-line option. (#2408)
Closes #2392
Co-authored-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/benchmark/catch_benchmark.hpp | 7 | ||||
| -rw-r--r-- | src/catch2/catch_config.cpp | 1 | ||||
| -rw-r--r-- | src/catch2/catch_config.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/interfaces/catch_interfaces_config.hpp | 1 | ||||
| -rw-r--r-- | src/catch2/internal/catch_commandline.cpp | 3 |
5 files changed, 12 insertions, 2 deletions
diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp index 28664b61..66e3670f 100644 --- a/src/catch2/benchmark/catch_benchmark.hpp +++ b/src/catch2/benchmark/catch_benchmark.hpp @@ -95,8 +95,11 @@ namespace Catch { // sets lambda to be used in fun *and* executes benchmark! template <typename Fun, std::enable_if_t<!Detail::is_related<Fun, Benchmark>::value, int> = 0> Benchmark & operator=(Fun func) { - fun = Detail::BenchmarkFunction(func); - run(); + auto const* cfg = getCurrentContext().getConfig(); + if (!cfg->skipBenchmarks()) { + fun = Detail::BenchmarkFunction(func); + run(); + } return *this; } diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp index 9e56e9fe..e3ce6b65 100644 --- a/src/catch2/catch_config.cpp +++ b/src/catch2/catch_config.cpp @@ -152,6 +152,7 @@ namespace Catch { bool Config::showInvisibles() const { return m_data.showInvisibles; } Verbosity Config::verbosity() const { return m_data.verbosity; } + bool Config::skipBenchmarks() const { return m_data.skipBenchmarks; } bool Config::benchmarkNoAnalysis() const { return m_data.benchmarkNoAnalysis; } unsigned int Config::benchmarkSamples() const { return m_data.benchmarkSamples; } double Config::benchmarkConfidenceInterval() const { return m_data.benchmarkConfidenceInterval; } diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp index 8823accd..a3dc010b 100644 --- a/src/catch2/catch_config.hpp +++ b/src/catch2/catch_config.hpp @@ -64,6 +64,7 @@ namespace Catch { unsigned int shardCount = 1; unsigned int shardIndex = 0; + bool skipBenchmarks = false; bool benchmarkNoAnalysis = false; unsigned int benchmarkSamples = 100; double benchmarkConfidenceInterval = 0.95; @@ -129,6 +130,7 @@ namespace Catch { int abortAfter() const override; bool showInvisibles() const override; Verbosity verbosity() const override; + bool skipBenchmarks() const override; bool benchmarkNoAnalysis() const override; unsigned int benchmarkSamples() const override; double benchmarkConfidenceInterval() const override; diff --git a/src/catch2/interfaces/catch_interfaces_config.hpp b/src/catch2/interfaces/catch_interfaces_config.hpp index 7e3c9d0b..5e358650 100644 --- a/src/catch2/interfaces/catch_interfaces_config.hpp +++ b/src/catch2/interfaces/catch_interfaces_config.hpp @@ -88,6 +88,7 @@ namespace Catch { virtual std::vector<std::string> const& getSectionsToRun() const = 0; virtual Verbosity verbosity() const = 0; + virtual bool skipBenchmarks() const = 0; virtual bool benchmarkNoAnalysis() const = 0; virtual unsigned int benchmarkSamples() const = 0; virtual double benchmarkConfidenceInterval() const = 0; diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index 59b06de9..f2f638bc 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -296,6 +296,9 @@ namespace Catch { | Opt( setWaitForKeypress, "never|start|exit|both" ) ["--wait-for-keypress"] ( "waits for a keypress before exiting" ) + | Opt( config.skipBenchmarks) + ["--skip-benchmarks"] + ( "disable running benchmarks") | Opt( config.benchmarkSamples, "samples" ) ["--benchmark-samples"] ( "number of samples to collect (default: 100)" ) |