3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small cleanups for the reworked test case order hashing

This commit is contained in:
Martin Hořeňovský 2020-11-17 21:08:33 +01:00
parent 3ba745552b
commit dc7e705672
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/internal/catch_test_case_registry_impl.cpp
View File

@ -24,10 +24,10 @@ namespace Catch {
struct TestHasher { struct TestHasher {
using hash_t = uint64_t; using hash_t = uint64_t;
explicit TestHasher(hash_t seed): m_seed{seed} { explicit TestHasher( hash_t hashSuffix ):
} m_hashSuffix{ hashSuffix } {}
hash_t operator()(TestCase const& t) const { uint32_t operator()( TestCase const& t ) const {
// FNV-1a hash with multiplication fold. // FNV-1a hash with multiplication fold.
const hash_t prime = 1099511628211u; const hash_t prime = 1099511628211u;
hash_t hash = 14695981039346656037u; hash_t hash = 14695981039346656037u;
@ -35,14 +35,15 @@ namespace Catch {
hash ^= c; hash ^= c;
hash *= prime; hash *= prime;
} }
hash ^= m_seed; hash ^= m_hashSuffix;
hash *= prime; hash *= prime;
const uint32_t low{ static_cast<uint32_t>( hash ) }; const uint32_t low{ static_cast<uint32_t>( hash ) };
const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) }; const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
return hash_t{ low * high }; return low * high;
} }
private: private:
hash_t m_seed; hash_t m_hashSuffix;
}; };
} // end unnamed namespace } // end unnamed namespace