Updates test expectations for most recent changes

louis-langholtz · Feb 28, 2023 · fd50d14 · fd50d14
1 parent 19f8105
commit fd50d14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/UnitTests/GearJoint.cpp b/UnitTests/GearJoint.cpp
@@ -46,16 +46,16 @@ TEST(GearJointConf, ByteSize)
     case 4:
 #if defined(_WIN32)
 #if defined(_WIN64)
-        EXPECT_EQ(sizeof(GearJointConf), std::size_t(152));
+        EXPECT_EQ(sizeof(GearJointConf), std::size_t(136));
 #else
-        EXPECT_EQ(sizeof(GearJointConf), std::size_t(132));
+        EXPECT_EQ(sizeof(GearJointConf), std::size_t(124));
 #endif
 #else
-        EXPECT_EQ(sizeof(GearJointConf), std::size_t(152));
+        EXPECT_EQ(sizeof(GearJointConf), std::size_t(136));
 #endif
         break;
     case 8:
-        EXPECT_EQ(sizeof(GearJointConf), std::size_t(256));
+        EXPECT_EQ(sizeof(GearJointConf), std::size_t(240));
         break;
     case 16:
         EXPECT_EQ(sizeof(GearJointConf), std::size_t(448));

diff --git a/UnitTests/World.cpp b/UnitTests/World.cpp
@@ -2770,11 +2770,23 @@ TEST(World_Longer, TilesComesToRest)
     EXPECT_EQ(sumToiVelIters, 112778ul);
 #elif defined(__arm64__)
     // At least for Apple Silicon...
-    EXPECT_EQ(numSteps, 1802ul);
-    EXPECT_EQ(sumRegPosIters, 36523ul);
-    EXPECT_EQ(sumRegVelIters, 46964ul);
-    EXPECT_EQ(sumToiPosIters, 43901ul);
-    EXPECT_EQ(sumToiVelIters, 113141ul);
+    switch (sizeof(Real))
+    {
+        case 4u:
+            EXPECT_EQ(numSteps, 1802ul);
+            EXPECT_EQ(sumRegPosIters, 36523ul);
+            EXPECT_EQ(sumRegVelIters, 46964ul);
+            EXPECT_EQ(sumToiPosIters, 43901ul);
+            EXPECT_EQ(sumToiVelIters, 113141ul);
+            break;
+        case 8u:
+            EXPECT_EQ(numSteps, 1828ul);
+            EXPECT_EQ(sumRegPosIters, 36540ul);
+            EXPECT_EQ(sumRegVelIters, 47173ul);
+            EXPECT_EQ(sumToiPosIters, 44005ul);
+            EXPECT_EQ(sumToiVelIters, 114252ul);
+            break;
+    }
 #else
     // These will likely fail and need to be tweaked for the particular hardware...
     EXPECT_EQ(numSteps, 1814ul);