From d2a2541de598f8d85dba28e88f0b44ccdcdd6ba6 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 10 Feb 2023 17:07:05 -0800
Subject: [PATCH] SL-19080: Restrict LLGLTFMaterial fields test to a single
compiler target, as results can vary between compilers
---
indra/llprimitive/tests/llgltfmaterial_test.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/indra/llprimitive/tests/llgltfmaterial_test.cpp b/indra/llprimitive/tests/llgltfmaterial_test.cpp
index 5ef88c81194..859cf99e3af 100644
--- a/indra/llprimitive/tests/llgltfmaterial_test.cpp
+++ b/indra/llprimitive/tests/llgltfmaterial_test.cpp
@@ -142,7 +142,10 @@ namespace tut
if (sizeof(void*) > 4) // Don't bother running this test for 32-bit systems
{
// If any fields are added/changed, these tests should be updated (consider also updating ASSET_VERSION in LLGLTFMaterial)
+ // This test result will vary between compilers, so only test a single platform
+#if LL_WINDOWS
ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 216);
+#endif
}
ensure_equals("LLGLTFMaterial texture info count", (U32)LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT, 4);
}
--
GitLab