diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
| commit | 6b4916fc758ba1ab70cced59b8fb959e241b984a (patch) | |
| tree | 9b72b24291554abe87456776ebaaa56e6c3f8ad7 /indra/llcommon/tests | |
| parent | dbdbcbbd3cc3ba21b255f992fae291ab3f13edcf (diff) | |
| parent | cfb1779e26d1ab15acdbc9d2fc5982b84af56765 (diff) | |
merge up to tip of viewer-tools-update
Diffstat (limited to 'indra/llcommon/tests')
| -rwxr-xr-x | indra/llcommon/tests/llframetimer_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llframetimer_test.cpp b/indra/llcommon/tests/llframetimer_test.cpp index 46fc4ce93a..47e7913cf9 100755 --- a/indra/llcommon/tests/llframetimer_test.cpp +++ b/indra/llcommon/tests/llframetimer_test.cpp @@ -84,6 +84,7 @@ namespace tut template<> template<> void frametimer_object_t::test<3>() { + skip("fails with Xcode 6.x builds"); F64 seconds_since_epoch = LLFrameTimer::getTotalSeconds(); seconds_since_epoch += 2.0; LLFrameTimer timer; |