3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-04 14:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Provide random-device option for --rng-seed and make it default

Browse Source
This commit is contained in:
Martin Hořeňovský
2021-10-08 21:32:03 +02:00
parent 200a487cf2
commit ed1f343a41
7 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/catch_config.cpp
View File

@@ -72,7 +72,7 @@ namespace Catch {
ShowDurations Config::showDurations() const { return m_data.showDurations; }
double Config::minDuration() const { return m_data.minDuration; }
TestRunOrder Config::runOrder() const { return m_data.runOrder; }
unsigned int Config::rngSeed() const { return *m_data.rngSeed; }
uint32_t Config::rngSeed() const { return m_data.rngSeed; }
UseColour Config::useColour() const { return m_data.useColour; }
bool Config::shouldDebugBreak() const { return m_data.shouldDebugBreak; }
int Config::abortAfter() const { return m_data.abortAfter; }

5
src/catch2/catch_config.hpp
View File

@@ -12,6 +12,7 @@
#include <catch2/interfaces/catch_interfaces_config.hpp>
#include <catch2/internal/catch_unique_ptr.hpp>
#include <catch2/internal/catch_optional.hpp>
#include <catch2/internal/catch_random_seed_generation.hpp>
#include <vector>
#include <string>
@@ -34,7 +35,7 @@ namespace Catch {
bool libIdentify = false;
int abortAfter = -1;
Optional<unsigned int> rngSeed;
uint32_t rngSeed = generateRandomSeed(GenerateFrom::Default);
bool benchmarkNoAnalysis = false;
unsigned int benchmarkSamples = 100;
@@ -97,7 +98,7 @@ namespace Catch {
ShowDurations showDurations() const override;
double minDuration() const override;
TestRunOrder runOrder() const override;
unsigned int rngSeed() const override;
uint32_t rngSeed() const override;
UseColour useColour() const override;
bool shouldDebugBreak() const override;
int abortAfter() const override;

5
src/catch2/catch_session.cpp
View File

@@ -24,7 +24,6 @@
#include <catch2/internal/catch_move_and_forward.hpp>
#include <algorithm>
#include <ctime>
#include <iomanip>
#include <set>
@@ -171,10 +170,6 @@ namespace Catch {
if( m_startupExceptions )
return 1;
if (!m_configData.rngSeed) {
m_configData.rngSeed = static_cast<unsigned int>(std::time(nullptr));
}
auto result = m_cli.parse( Clara::Args( argc, argv ) );
if( !result ) {
config();

2
src/catch2/interfaces/catch_interfaces_config.hpp
View File

@@ -73,7 +73,7 @@ namespace Catch {
virtual bool hasTestFilters() const = 0;
virtual std::vector<std::string> const& getTestsOrTags() const = 0;
virtual TestRunOrder runOrder() const = 0;
virtual unsigned int rngSeed() const = 0;
virtual uint32_t rngSeed() const = 0;
virtual UseColour useColour() const = 0;
virtual std::vector<std::string> const& getSectionsToRun() const = 0;
virtual Verbosity verbosity() const = 0;

8
src/catch2/internal/catch_commandline.cpp
View File

@@ -15,7 +15,6 @@
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <fstream>
#include <ctime>
#include <string>
namespace Catch {
@@ -74,7 +73,10 @@ namespace Catch {
};
auto const setRngSeed = [&]( std::string const& seed ) {
if( seed == "time" ) {
config.rngSeed = static_cast<unsigned int>(std::time(nullptr));
config.rngSeed = generateRandomSeed(GenerateFrom::Time);
return ParserResult::ok(ParseResultType::Matched);
} else if (seed == "random-device") {
config.rngSeed = generateRandomSeed(GenerateFrom::RandomDevice);
return ParserResult::ok(ParseResultType::Matched);
}
@@ -211,7 +213,7 @@ namespace Catch {
| Opt( setTestOrder, "decl|lex|rand" )
["--order"]
( "test case order (defaults to decl)" )
| Opt( setRngSeed, "'time'|number" )
| Opt( setRngSeed, "'time'|'random-device'|number" )
["--rng-seed"]
( "set a specific seed for random numbers" )
| Opt( setColourUsage, "yes|no" )