diff options
| author | callum_linden <none@none> | 2014-11-14 14:52:33 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-11-14 14:52:33 -0800 |
| commit | cfb1779e26d1ab15acdbc9d2fc5982b84af56765 (patch) | |
| tree | 144f7f5ddcce60c430ba1df9c26580d763a1bb8a /indra/llcommon/tests | |
| parent | 78a75ca00f77d98a2fc62e8828df2eb5600bbad4 (diff) | |
| parent | 014065015a6a3a79c7786f22b65c99f856e413a0 (diff) | |
merge with head
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 8ac1c91a3a..40a028867c 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; |