diff options
| author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2020-04-23 11:10:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 11:10:07 +0200 |
| commit | 5a0989e6fa1bda32c0e16f2b31d98a0f868aa7da (patch) | |
| tree | a20ac6131e6ea6aac46e72dd03562e1f94a8e90f /storage | |
| parent | b7d47818f71d03727c628ee3fed02b69e30439b5 (diff) | |
| parent | e9ca4ef4898c15b1c07df5a002646e35be5bd9b3 (diff) | |
Merge pull request #13025 from vespa-engine/toregge/relax-judy-array-test-null-pointer-output-check
Some libraries print "0x0" for a null void ptr
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/bucketdb/judyarraytest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/tests/bucketdb/judyarraytest.cpp b/storage/src/tests/bucketdb/judyarraytest.cpp index 94d61107fcf..72967e8b4c0 100644 --- a/storage/src/tests/bucketdb/judyarraytest.cpp +++ b/storage/src/tests/bucketdb/judyarraytest.cpp @@ -62,7 +62,7 @@ TEST(JudyArrayTest, iterating) { JudyArray::ConstIterator cit = array.begin(); EXPECT_THAT(cit.toString(), MatchesRegex("^ConstIterator\\(Key: 3, Valp: 0x[0-9a-f]{1,16}, Val: 2\\)$")); JudyArray::Iterator it = array.end(); - EXPECT_THAT(it.toString(), MatchesRegex("^Iterator\\(Key: 0, Valp: 0\\)$")); + EXPECT_THAT(it.toString(), MatchesRegex("^Iterator\\(Key: 0, Valp: (0x)?0\\)$")); } } |