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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-10-08 21:32:03 +0200
committerMartin Hořeňovský2021-10-08 21:35:45 +0200
commited1f343a41ef9b0db576971f86ccd384bdbaa5d8 (patch)
tree5d71a801b3e6d869e5f6ab0c628130ae220799d7 /src
parent200a487cf293c31e277df9b43a52260d8f982efb (diff)
downloadcatch3-ed1f343a41ef9b0db576971f86ccd384bdbaa5d8.tar.gz
Provide random-device option for --rng-seed and make it default
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_config.cpp2
-rw-r--r--src/catch2/catch_config.hpp5
-rw-r--r--src/catch2/catch_session.cpp5
-rw-r--r--src/catch2/interfaces/catch_interfaces_config.hpp2
-rw-r--r--src/catch2/internal/catch_commandline.cpp8
5 files changed, 10 insertions, 12 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 20303c2a..b79059ec 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -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; }
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index 65a50ed8..7b67ba76 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -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;
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 913c7111..e7878117 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -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();
diff --git a/src/catch2/interfaces/catch_interfaces_config.hpp b/src/catch2/interfaces/catch_interfaces_config.hpp
index 60c4e9be..e40cf702 100644
--- a/src/catch2/interfaces/catch_interfaces_config.hpp
+++ b/src/catch2/interfaces/catch_interfaces_config.hpp
@@ -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;
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp
index e5fdd692..ad571cc5 100644
--- a/src/catch2/internal/catch_commandline.cpp
+++ b/src/catch2/internal/catch_commandline.cpp
@@ -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" )