commit 13d2e0d39f6d8c923f5b92984ce52ee6e14f5436
author Jan Eilers <jan.eilers@arm.com> Tue Sep 28 15:11:28 2021 +0100
committer Colm Donelan <colm.donelan@arm.com> Tue Oct 12 14:46:23 2021 +0000
tree b71f219ee2f853c149bd554f8983d9566de0d61e
parent 26f64fe7ba9204529c360a1950ac9e58dd507ae0

Github 581 - Upgrade doctest

 * Upgrade doctest to version 2.4.6 to allow Arm NN to build with
   glibc 2.34

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: Iff2ef286ba5ad0e0ec0f54f510253a2ec4b464d3

src/armnnSerializer/test/SerializerTestUtils.cpp

diff --git a/src/armnnSerializer/test/SerializerTestUtils.cpp b/src/armnnSerializer/test/SerializerTestUtils.cpp
index caa1157..d0a8e2d 100644
--- a/src/armnnSerializer/test/SerializerTestUtils.cpp
+++ b/src/armnnSerializer/test/SerializerTestUtils.cpp
@@ -75,24 +75,24 @@
 {
     if (expectedPtr == nullptr)
     {
-        CHECK_MESSAGE(actualPtr == nullptr, tensorName + " should not exist");
+        CHECK_MESSAGE(actualPtr == nullptr, (tensorName + " should not exist"));
     }
     else
     {
-        CHECK_MESSAGE(actualPtr != nullptr, tensorName + " should have been set");
+        CHECK_MESSAGE(actualPtr != nullptr, (tensorName + " should have been set"));
         if (actualPtr != nullptr)
         {
             const armnn::TensorInfo& expectedInfo = expectedPtr->GetInfo();
             const armnn::TensorInfo& actualInfo = actualPtr->GetInfo();
 
             CHECK_MESSAGE(expectedInfo.GetShape() == actualInfo.GetShape(),
-                                tensorName + " shapes don't match");
+                          (tensorName + " shapes don't match"));
             CHECK_MESSAGE(
                     GetDataTypeName(expectedInfo.GetDataType()) == GetDataTypeName(actualInfo.GetDataType()),
-                    tensorName + " data types don't match");
+                    (tensorName + " data types don't match"));
 
             CHECK_MESSAGE(expectedPtr->GetNumBytes() == actualPtr->GetNumBytes(),
-                                tensorName + " (GetNumBytes) data sizes do not match");
+                          (tensorName + " (GetNumBytes) data sizes do not match"));
             if (expectedPtr->GetNumBytes() == actualPtr->GetNumBytes())
             {
                 //check the data is identical
@@ -107,7 +107,7 @@
                         break;
                     }
                 }
-                CHECK_MESSAGE(same, tensorName + " data does not match");
+                CHECK_MESSAGE(same, (tensorName + " data does not match"));
             }
         }
     }