From 340cac20a9b7744d32c460b2b3b2af452ea98299 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 2 Oct 2018 17:55:06 +1300 Subject: [PATCH] Improve output when uuid1 fails Cast the bytes we test in the UUID to int so that they're reported as number and not characters if the check fails. (cherry picked from commit a1f7c0b3490146f567c321abc7e25f3ad5b35685) --- xapian-core/tests/unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xapian-core/tests/unittest.cc b/xapian-core/tests/unittest.cc index f4534dac2..cc9790df7 100644 --- a/xapian-core/tests/unittest.cc +++ b/xapian-core/tests/unittest.cc @@ -635,8 +635,8 @@ static bool test_uuid1() TEST_EQUAL(uuid.data()[8] & 0xc0, 0x80); TEST_REL(str[19], >=, '8'); TEST_REL(str[19], <=, 'b'); - TEST_REL(uuid.data()[6], >=, 0x10); - TEST_REL(uuid.data()[6], <=, 0x5f); + TEST_REL(int(uuid.data()[6]), >=, 0x10); + TEST_REL(int(uuid.data()[6]), <=, 0x5f); TEST_REL(str[14], >=, '1'); TEST_REL(str[14], <=, '5'); -- 2.11.4.GIT