summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-09-12 18:08:35 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-09-12 18:08:35 -0700
commite6346ffdcf80a77e8174bd50d87566755678b527 (patch)
tree22661e3e0b0c7f7993bd6c2a546f1105a1c726d8 /indra
parentb26a9ceb2ea3964180b61c784a5673a54b4e7153 (diff)
Restore alignment tests that were removed earlier
Diffstat (limited to 'indra')
-rw-r--r--indra/llmath/tests/alignment_test.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/llmath/tests/alignment_test.cpp b/indra/llmath/tests/alignment_test.cpp
index bbc68fc498..ced039b2c6 100644
--- a/indra/llmath/tests/alignment_test.cpp
+++ b/indra/llmath/tests/alignment_test.cpp
@@ -78,12 +78,11 @@ public:
template<> template<>
void alignment_test_object_t::test<1>()
{
- skip("Skipping known failure.");
# ifdef LL_DEBUG
// skip("This test fails on Windows when compiled in debug mode.");
# endif
- /*const int num_tests = 7;
+ const int num_tests = 7;
void *align_ptr;
for (int i=0; i<num_tests; i++)
{
@@ -98,26 +97,24 @@ void alignment_test_object_t::test<1>()
align_ptr = ll_aligned_malloc_32(sizeof(MyVector4a));
ensure("ll_aligned_malloc_32 failed", is_aligned(align_ptr,32));
ll_aligned_free_32(align_ptr);
- }*/
+ }
}
// In-place allocation of objects and arrays.
template<> template<>
void alignment_test_object_t::test<2>()
{
- skip("Skipping known failure.");
- /*MyVector4a vec1;
+ MyVector4a vec1;
ensure("LLAlignment vec1 unaligned", is_aligned(&vec1,16));
MyVector4a veca[12];
- ensure("LLAlignment veca unaligned", is_aligned(veca,16));*/
+ ensure("LLAlignment veca unaligned", is_aligned(veca,16));
}
// Heap allocation of objects and arrays.
template<> template<>
void alignment_test_object_t::test<3>()
{
- skip("Skipping known failure.");
# ifdef LL_DEBUG
// skip("This test fails on Windows when compiled in debug mode.");
# endif