merge with more fixes from callum

2 files changed, 3 insertions, 2 deletions

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;