diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/llmath/tests/m3math_test.cpp | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) |
merge out latest viewer-development
Diffstat (limited to 'indra/llmath/tests/m3math_test.cpp')
-rw-r--r-- | indra/llmath/tests/m3math_test.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp index e4d31996a3..baff5a2d45 100644 --- a/indra/llmath/tests/m3math_test.cpp +++ b/indra/llmath/tests/m3math_test.cpp @@ -36,6 +36,16 @@ #include "../v3dmath.h" #include "../test/lltut.h" +
+#if LL_WINDOWS
+// disable unreachable code warnings caused by usage of skip.
+#pragma warning(disable: 4702)
+#endif
+ +#if LL_WINDOWS +// disable unreachable code warnings caused by usage of skip. +#pragma warning(disable: 4702) +#endif namespace tut { @@ -277,19 +287,21 @@ namespace tut LLVector3 llvec2(1, 2, 0); LLVector3 llvec3(2, 4, 2); + skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform."); + llmat_obj.setRows(llvec1, llvec2, llvec3); llmat_obj.orthogonalize(); ensure("LLMatrix3::orthogonalize failed ", - is_approx_equal(0.19611613f, llmat_obj.mMatrix[0][0]) && + is_approx_equal(0.19611614f, llmat_obj.mMatrix[0][0]) && is_approx_equal(0.78446454f, llmat_obj.mMatrix[0][1]) && - is_approx_equal(0.58834839f, llmat_obj.mMatrix[0][2]) && - is_approx_equal(0.47628206f, llmat_obj.mMatrix[1][0]) && - is_approx_equal(0.44826555f, llmat_obj.mMatrix[1][1]) && - is_approx_equal(-0.75644791f, llmat_obj.mMatrix[1][2]) && - is_approx_equal(-0.85714287f, llmat_obj.mMatrix[2][0]) && + is_approx_equal(0.58834841f, llmat_obj.mMatrix[0][2]) && + is_approx_equal(0.47628204f, llmat_obj.mMatrix[1][0]) && + is_approx_equal(0.44826545f, llmat_obj.mMatrix[1][1]) && + is_approx_equal(-0.75644795f, llmat_obj.mMatrix[1][2]) && + is_approx_equal(-0.85714286f, llmat_obj.mMatrix[2][0]) && is_approx_equal(0.42857143f, llmat_obj.mMatrix[2][1]) && - is_approx_equal(-0.28571427f, llmat_obj.mMatrix[2][2])); + is_approx_equal(-0.28571429f, llmat_obj.mMatrix[2][2])); } //test case for adjointTranspose() fn. |