From 404c6718bda5cb32487fa7a8295c875d04e9d083 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Wed, 26 Mar 2025 17:38:59 +0100 Subject: [PATCH] Add safer float comparisons to bridgetest equals() Bug-Ubuntu: https://launchpad.net/bugs/1832360 Gbp-Pq: Name fix-flaky-bridgetest.diff --- testtools/source/bridgetest/bridgetest.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index eedf85f13de..e91d4a9fe0c 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -125,6 +125,9 @@ public: static bool equals( const TestElement & rData1, const TestElement & rData2 ) { + const float epsilon_f = 0.00001f; + const double epsilon_d = 0.000000000001; + check( rData1.Bool == rData2.Bool, "### bool does not match!" ); check( rData1.Char == rData2.Char, "### char does not match!" ); check( rData1.Byte == rData2.Byte, "### byte does not match!" ); @@ -134,8 +137,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) check( rData1.ULong == rData2.ULong, "### unsigned long does not match!" ); check( rData1.Hyper == rData2.Hyper, "### hyper does not match!" ); check( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" ); - check( rData1.Float == rData2.Float, "### float does not match!" ); - check( rData1.Double == rData2.Double, "### double does not match!" ); + check( fabs( rData1.Float - rData2.Float ) < epsilon_f, "### float does not match!" ); + check( fabs( rData1.Double - rData2.Double ) < epsilon_d, "### double does not match!" ); check( rData1.Enum == rData2.Enum, "### enum does not match!" ); check( rData1.String == rData2.String, "### string does not match!" ); check( rData1.Byte2 == rData2.Byte2, "### byte2 does not match!" ); @@ -152,8 +155,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) rData1.ULong == rData2.ULong && rData1.Hyper == rData2.Hyper && rData1.UHyper == rData2.UHyper && - rData1.Float == rData2.Float && - rData1.Double == rData2.Double && + fabs( rData1.Float - rData2.Float ) < epsilon_f && + fabs( rData1.Double - rData2.Double ) < epsilon_d && rData1.Enum == rData2.Enum && rData1.String == rData2.String && rData1.Byte2 == rData2.Byte2 && -- 2.30.2