From 67922f41b9bb3b2b1ec25b43cb1601882ccbe1c7 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino Date: Thu, 18 Jul 2024 04:49:33 -0700 Subject: [PATCH] Exclude nbuffer from CompareModel. This will give more informative errors when the test fails. PiperOrigin-RevId: 653571444 Change-Id: I78b0a2bfc7794dae81607a9dbbdb91439af48b0c --- test/fixture.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/fixture.cc b/test/fixture.cc index 4e231408..9532ca79 100644 --- a/test/fixture.cc +++ b/test/fixture.cc @@ -218,9 +218,13 @@ mjtNum CompareModel(const mjModel* m1, const mjModel* m2, // (needed in MJMODEL_POINTERS) MJMODEL_POINTERS_PREAMBLE(m1); - // compare ints + // compare ints, exclude nbuffer because it hides the actual difference #define X(name) \ - if (m1->name != m2->name) {maxdif = m1->name - m2->name; field = #name;} + if (strncmp(#name, "nbuffer", 7)) { \ + if (m1->name != m2->name) { \ + maxdif = mju_abs(m1->name - m2->name); field = #name; \ + } \ + } MJMODEL_INTS #undef X if (maxdif > 0) return maxdif;