summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-02-14 15:33:52 -0800
committerCosmic Linden <cosmic@lindenlab.com>2023-02-15 09:42:35 -0800
commitdf440f3f33a277f927035d051bc98341227bbea5 (patch)
treea4247152fb2590b7ca794f13d6da669b331b596b /indra/llprimitive/tests
parentb66c95e487303f9e566b2cbc85fc26676a48ce66 (diff)
SL-19121: Address review comments from SL-19080 phase 2
Diffstat (limited to 'indra/llprimitive/tests')
-rw-r--r--indra/llprimitive/tests/llgltfmaterial_test.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llprimitive/tests/llgltfmaterial_test.cpp b/indra/llprimitive/tests/llgltfmaterial_test.cpp
index 97aa544c60..b3f56788f7 100644
--- a/indra/llprimitive/tests/llgltfmaterial_test.cpp
+++ b/indra/llprimitive/tests/llgltfmaterial_test.cpp
@@ -139,14 +139,13 @@ namespace tut
template<> template<>
void llgltfmaterial_object_t::test<1>()
{
- 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 ADDRESS_SIZE != 32
#if LL_WINDOWS
- ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 216);
+ // 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
+ ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 216);
+#endif
#endif
- }
ensure_equals("LLGLTFMaterial texture info count", (U32)LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT, 4);
}