diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-22 16:46:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-22 16:46:12 -0400 |
| commit | 25dcb53aa229cf980449416bd59e42bd265041d0 (patch) | |
| tree | d0c7426810a596e2b514128cf7e7bf789231d93b | |
| parent | 04291ba319a6e68f2c2e9bd8e299878b93424452 (diff) | |
| parent | 60f4494dc09587e6b622e5241a5f98a5bd521f56 (diff) | |
merge with more fixes from callum
| -rw-r--r-- | XCODE_6_UPGRADES_TODO.txt | 5 | ||||
| -rwxr-xr-x | indra/llcommon/tests/llerror_test.cpp | 4 | ||||
| -rwxr-xr-x | indra/llcommon/tests/lleventcoro_test.cpp | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt index 0abf928b22..8f11590810 100644 --- a/XCODE_6_UPGRADES_TODO.txt +++ b/XCODE_6_UPGRADES_TODO.txt @@ -1,7 +1,12 @@ + * autobuild configure with tests on (LL_TESTS:BOOL=ON) and fix errors * Fix up commented out code in 'tut' package - tut/tut/tut_assert.hpp #82 & #84 (no operator << for T & Q), rebuild package and point autobuild.xml at original version +* Release builds on initial inspection at least, run 1/3 the speed (frame rate meter) of same viewer-release build - clang optimization off? + +* Should we be using libstdc++ (GNU) or libc++ (clang) - using the former but latter is more 'clang'y + * Investigates: https://bitbucket.org/callum_linden/viewer-tools-update-callum/commits/3d2fb85943d527e7db9908ff2824bc54afe916f1 Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? - No, it's something else - lots of occurences in build-darwin folder but where do they come from? .... diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index febfa782ca..1ac72d13bf 100755 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -485,7 +485,9 @@ namespace tut // handle nested logging void ErrorTestObject::test<7>() { - skip("Fails on clang TODO"); +#if LL_DARWIN + skip("Skip known failure on clang and intelc due to operator << differences"); +#endif outerLogger(); ensure_message_contains(0, "inside"); ensure_message_contains(1, "outside(moo)"); diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index cb5e15eff2..2096807e53 100755 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -94,7 +94,6 @@ using coroutines::coroutine; template<typename Iter> bool match(Iter first, Iter last, std::string match) { std::string::iterator i = match.begin(); - i != match.end(); for(; (first != last) && (i != match.end()); ++i) { if (*first != *i) return false; |