Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c

12 files changed, 235 insertions, 107 deletions

diff --git a/indra/llcommon/tests/StringVec.h b/indra/llcommon/tests/StringVec.h
index 4311cba992..3f8665affb 100644
--- a/indra/llcommon/tests/StringVec.h
+++ b/indra/llcommon/tests/StringVec.h
@@ -18,6 +18,16 @@
 
 typedef std::vector<std::string> StringVec;
 
+#if defined(LL_LLTUT_H)
+// Modern compilers require us to define operator<<(std::ostream&, StringVec)
+// before the definition of the ensure() template that engages it. The error
+// stating that the compiler can't find a viable operator<<() is so perplexing
+// that even though I've obviously hit it a couple times before, a new
+// instance still caused much head-scratching. This warning is intended to
+// demystify any inadvertent future recurrence.
+#warning "StringVec.h must be #included BEFORE lltut.h for ensure() to work"
+#endif
+
 std::ostream& operator<<(std::ostream& out, const StringVec& strings)
 {
     out << '(';
diff --git a/indra/llcommon/tests/llcond_test.cpp b/indra/llcommon/tests/llcond_test.cpp
index f2a302ed13..7d1ac6edb9 100644
--- a/indra/llcommon/tests/llcond_test.cpp
+++ b/indra/llcommon/tests/llcond_test.cpp
@@ -19,6 +19,7 @@
 // other Linden headers
 #include "../test/lltut.h"
 #include "llcoros.h"
+#include "lldefs.h"                 // llless()
 
 /*****************************************************************************
 *   TUT
@@ -64,4 +65,78 @@ namespace tut
         cond.set_all(2);
         cond.wait_equal(3);
     }
+
+    template <typename T0, typename T1>
+    struct compare
+    {
+        const char* desc;
+        T0 lhs;
+        T1 rhs;
+        bool expect;
+
+        void test() const
+        {
+            // fails
+//          ensure_equals(desc, (lhs <  rhs), expect);
+            ensure_equals(desc, llless(lhs, rhs), expect);
+        }
+    };
+
+    template<> template<>
+    void object::test<3>()
+    {
+        set_test_name("comparison");
+        // Try to construct signed and unsigned variables such that the
+        // compiler can't optimize away the code to compare at runtime.
+        std::istringstream input("-1 10 20 10 20");
+        int minus1, s10, s20;
+        input >> minus1 >> s10 >> s20;
+        unsigned u10, u20;
+        input >> u10 >> u20;
+        ensure_equals("minus1 wrong", minus1, -1);
+        ensure_equals("s10 wrong", s10, 10);
+        ensure_equals("s20 wrong", s20, 20);
+        ensure_equals("u10 wrong", u10, 10);
+        ensure_equals("u20 wrong", u20, 20);
+        // signed < signed should always work!
+        compare<int, int> ss[] =
+            { {"minus1 < s10", minus1, s10, true},
+              {"s10 < s10", s10, s10, false},
+              {"s20 < s10", s20, s20, false}
+            };
+        for (const auto& cmp : ss)
+        {
+            cmp.test();
+        }
+        // unsigned < unsigned should always work!
+        compare<unsigned, unsigned> uu[] =
+            { {"u10 < u20", u10, u20, true},
+              {"u20 < u20", u20, u20, false},
+              {"u20 < u10", u20, u10, false}
+            };
+        for (const auto& cmp : uu)
+        {
+            cmp.test();
+        }
+        // signed < unsigned ??
+        compare<int, unsigned> su[] =
+            { {"minus1 < u10", minus1, u10, true},
+              {"s10 < u10", s10, u10, false},
+              {"s20 < u10", s20, u10, false}
+            };
+        for (const auto& cmp : su)
+        {
+            cmp.test();
+        }
+        // unsigned < signed ??
+        compare<unsigned, int> us[] =
+            { {"u10 < minus1", u10, minus1, false},
+              {"u10 < s10", u10, s10, false},
+              {"u10 < s20", u10, s20, true}
+            };
+        for (const auto& cmp : us)
+        {
+            cmp.test();
+        }
+    }
 } // namespace tut
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 3ec429530c..b6a1bea42c 100644
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -61,6 +61,8 @@ namespace
 {
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wunused-function"
+#elif defined(LL_GNUC)
+#   pragma GCC diagnostic ignored "-Wunused-function"
 #endif
     void test_that_error_h_includes_enough_things_to_compile_a_message()
     {
@@ -112,10 +114,10 @@ namespace tut
             mMessages.push_back(message);
         }
 
-        int countMessages()         { return (int) mMessages.size(); }
+        int countMessages() const   { return (int) mMessages.size(); }
         void clearMessages()        { mMessages.clear(); }
 
-        std::string message(int n)
+        std::string message(int n) const
         {
             std::ostringstream test_name;
             test_name << "testing message " << n << ", not enough messages";
@@ -124,6 +126,16 @@ namespace tut
             return mMessages[n];
         }
 
+        void reportMessages() const
+        {
+            std::cerr << '\n';
+            int n = 0;
+            for (const auto& msg : mMessages)
+            {
+                std::cerr << std::setw(2) << n++ << ": " << msg.substr(0, 100) << '\n';
+            }
+        }
+
     private:
         typedef std::vector<std::string> MessageVector;
         MessageVector mMessages;
@@ -134,6 +146,8 @@ namespace tut
         LLError::RecorderPtr mRecorder;
         LLError::SettingsStoragePtr mPriorErrorSettings;
 
+        auto recorder() { return std::dynamic_pointer_cast<TestRecorder>(mRecorder); }
+
         ErrorTestData():
             mRecorder(new TestRecorder())
         {
@@ -153,27 +167,32 @@ namespace tut
 
         int countMessages()
         {
-            return std::dynamic_pointer_cast<TestRecorder>(mRecorder)->countMessages();
+            return recorder()->countMessages();
         }
 
         void clearMessages()
         {
-            std::dynamic_pointer_cast<TestRecorder>(mRecorder)->clearMessages();
+            recorder()->clearMessages();
         }
 
         void setWantsTime(bool t)
-            {
-                std::dynamic_pointer_cast<TestRecorder>(mRecorder)->showTime(t);
-            }
+        {
+            recorder()->showTime(t);
+        }
 
         void setWantsMultiline(bool t)
-            {
-                std::dynamic_pointer_cast<TestRecorder>(mRecorder)->showMultiline(t);
-            }
+        {
+            recorder()->showMultiline(t);
+        }
 
         std::string message(int n)
         {
-            return std::dynamic_pointer_cast<TestRecorder>(mRecorder)->message(n);
+            return recorder()->message(n);
+        }
+
+        void reportMessages()
+        {
+            recorder()->reportMessages();
         }
 
         void ensure_message_count(int expectedCount)
@@ -204,7 +223,7 @@ namespace tut
                         on_field++;
                     }
                     // except function, which may have embedded spaces so ends with " : "
-                    else if (   ( on_field == FUNCTION_FIELD )
+                    else if (( on_field == FUNCTION_FIELD )
                              && ( ':' == msg[scan+1] && ' ' == msg[scan+2] )
                              )
                     {
@@ -233,19 +252,35 @@ namespace tut
         }
 
         void ensure_message_field_equals(int msgnum, LogFieldIndex fieldnum, const std::string& expectedText)
-         {
-             std::ostringstream test_name;
-             test_name << "testing message " << msgnum << " field " << FieldName[fieldnum] << "\n  message: \"" << message(msgnum) << "\"\n  ";
+        {
+            std::ostringstream test_name;
+            test_name << "testing message " << msgnum << " field " << FieldName[fieldnum] << "\n  message: \"" << message(msgnum).substr(0, 100) << "\"\n   ";
 
-             ensure_equals(test_name.str(), message_field(msgnum, fieldnum), expectedText);
-         }
+            try
+            {
+                ensure_equals(test_name.str(), message_field(msgnum, fieldnum), expectedText);
+            }
+            catch (const failure&)
+            {
+                reportMessages();
+                throw;
+            }
+        }
 
         void ensure_message_does_not_contain(int n, const std::string& expectedText)
         {
             std::ostringstream test_name;
             test_name << "testing message " << n;
 
-            ensure_does_not_contain(test_name.str(), message(n), expectedText);
+            try
+            {
+                ensure_does_not_contain(test_name.str(), message(n), expectedText);
+            }
+            catch (const failure&)
+            {
+                reportMessages();
+                throw;
+            }
         }
     };
 
@@ -297,29 +332,33 @@ namespace tut
         ensure_message_field_equals(3, MSG_FIELD, "four");
         ensure_message_field_equals(3, LEVEL_FIELD, "ERROR");
         ensure_message_field_equals(3, TAGS_FIELD, "#WriteTag#");
-        ensure_message_count(4);
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(5);
 
         LLError::setDefaultLevel(LLError::LEVEL_INFO);
         writeSome();
-        ensure_message_field_equals(4, MSG_FIELD, "two");
-        ensure_message_field_equals(5, MSG_FIELD, "three");
-        ensure_message_field_equals(6, MSG_FIELD, "four");
-        ensure_message_count(7);
+        ensure_message_field_equals(5, MSG_FIELD, "two");
+        ensure_message_field_equals(6, MSG_FIELD, "three");
+        ensure_message_field_equals(7, MSG_FIELD, "four");
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(9);
 
         LLError::setDefaultLevel(LLError::LEVEL_WARN);
         writeSome();
-        ensure_message_field_equals(7, MSG_FIELD, "three");
-        ensure_message_field_equals(8, MSG_FIELD, "four");
-        ensure_message_count(9);
+        ensure_message_field_equals(9, MSG_FIELD, "three");
+        ensure_message_field_equals(10, MSG_FIELD, "four");
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(12);
 
         LLError::setDefaultLevel(LLError::LEVEL_ERROR);
         writeSome();
-        ensure_message_field_equals(9, MSG_FIELD, "four");
-        ensure_message_count(10);
+        ensure_message_field_equals(12, MSG_FIELD, "four");
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(14);
 
         LLError::setDefaultLevel(LLError::LEVEL_NONE);
         writeSome();
-        ensure_message_count(10);
+        ensure_message_count(14);
     }
 
     template<> template<>
@@ -331,7 +370,8 @@ namespace tut
         ensure_message_field_equals(1, LEVEL_FIELD, "INFO");
         ensure_message_field_equals(2, LEVEL_FIELD, "WARNING");
         ensure_message_field_equals(3, LEVEL_FIELD, "ERROR");
-        ensure_message_count(4);
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(5);
     }
 
     template<> template<>
@@ -627,7 +667,8 @@ namespace tut
 
         ensure_message_field_equals(0, LOCATION_FIELD, location);
         ensure_message_field_equals(0, MSG_FIELD, "die");
-        ensure_message_count(1);
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(2);
 
         ensure("fatal callback called", fatalWasCalled);
     }
@@ -751,10 +792,12 @@ namespace tut
 
         ensure_message_field_equals(0, MSG_FIELD, "aim west");
         ensure_message_field_equals(1, MSG_FIELD, "ate eels");
-        ensure_message_field_equals(2, MSG_FIELD, "buy iron");
-        ensure_message_field_equals(3, MSG_FIELD, "bad word");
-        ensure_message_field_equals(4, MSG_FIELD, "big easy");
-        ensure_message_count(5);
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_field_equals(3, MSG_FIELD, "buy iron");
+        ensure_message_field_equals(4, MSG_FIELD, "bad word");
+        ensure_message_field_equals(5, MSG_FIELD, "big easy");
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(7);
     }
 
     template<> template<>
@@ -868,9 +911,11 @@ namespace tut
         TestBeta::doAll();
         ensure_message_field_equals(3, MSG_FIELD, "aim west");
         ensure_message_field_equals(4, MSG_FIELD, "ate eels");
-        ensure_message_field_equals(5, MSG_FIELD, "bad word");
-        ensure_message_field_equals(6, MSG_FIELD, "big easy");
-        ensure_message_count(7);
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_field_equals(6, MSG_FIELD, "bad word");
+        ensure_message_field_equals(7, MSG_FIELD, "big easy");
+        // LL_ERRS() produces 2 recordMessage() calls
+        ensure_message_count(9);
     }
 }
 
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp
index ab174a8bde..0e352bce0f 100644
--- a/indra/llcommon/tests/lleventcoro_test.cpp
+++ b/indra/llcommon/tests/lleventcoro_test.cpp
@@ -111,14 +111,13 @@ namespace tut
 
     void test_data::explicit_wait(std::shared_ptr<LLCoros::Promise<std::string>>& cbp)
     {
-        BEGIN
-        {
-            mSync.bump();
-            // The point of this test is to verify / illustrate suspending a
-            // coroutine for something other than an LLEventPump. In other
-            // words, this shows how to adapt to any async operation that
-            // provides a callback-style notification (and prove that it
-            // works).
+        DEBUG;
+        mSync.bump();
+        // The point of this test is to verify / illustrate suspending a
+        // coroutine for something other than an LLEventPump. In other
+        // words, this shows how to adapt to any async operation that
+        // provides a callback-style notification (and prove that it
+        // works).
 
             // Perhaps we would send a request to a remote server and arrange
             // for cbp->set_value() to be called on response.
@@ -128,13 +127,11 @@ namespace tut
             cbp = std::make_shared<LLCoros::Promise<std::string>>();
             LLCoros::Future<std::string> future = LLCoros::getFuture(*cbp);
 
-            // calling get() on the future causes us to suspend
-            debug("about to suspend");
-            stringdata = future.get();
-            mSync.bump();
-            ensure_equals("Got it", stringdata, "received");
-        }
-        END
+        // calling get() on the future causes us to suspend
+        debug("about to suspend");
+        stringdata = future.get();
+        mSync.bump();
+        ensure_equals("Got it", stringdata, "received");
     }
 
     template<> template<>
@@ -161,13 +158,9 @@ namespace tut
 
     void test_data::waitForEventOn1()
     {
-        BEGIN
-        {
-            mSync.bump();
-            result = suspendUntilEventOn("source");
-            mSync.bump();
-        }
-        END
+        mSync.bump();
+        result = suspendUntilEventOn("source");
+        mSync.bump();
     }
 
     template<> template<>
@@ -187,15 +180,11 @@ namespace tut
 
     void test_data::coroPump()
     {
-        BEGIN
-        {
-            mSync.bump();
-            LLCoroEventPump waiter;
-            replyName = waiter.getName();
-            result = waiter.suspend();
-            mSync.bump();
-        }
-        END
+        mSync.bump();
+        LLCoroEventPump waiter;
+        replyName = waiter.getName();
+        result = waiter.suspend();
+        mSync.bump();
     }
 
     template<> template<>
@@ -215,16 +204,12 @@ namespace tut
 
     void test_data::postAndWait1()
     {
-        BEGIN
-        {
-            mSync.bump();
-            result = postAndSuspend(LLSDMap("value", 17),       // request event
-                                 immediateAPI.getPump(),     // requestPump
-                                 "reply1",                   // replyPump
-                                 "reply");                   // request["reply"] = name
-            mSync.bump();
-        }
-        END
+        mSync.bump();
+        result = postAndSuspend(LLSDMap("value", 17),       // request event
+                                immediateAPI.getPump(),     // requestPump
+                                "reply1",                   // replyPump
+                                "reply");                   // request["reply"] = name
+        mSync.bump();
     }
 
     template<> template<>
@@ -238,15 +223,11 @@ namespace tut
 
     void test_data::coroPumpPost()
     {
-        BEGIN
-        {
-            mSync.bump();
-            LLCoroEventPump waiter;
-            result = waiter.postAndSuspend(LLSDMap("value", 17),
-                                        immediateAPI.getPump(), "reply");
-            mSync.bump();
-        }
-        END
+        mSync.bump();
+        LLCoroEventPump waiter;
+        result = waiter.postAndSuspend(LLSDMap("value", 17),
+                                       immediateAPI.getPump(), "reply");
+        mSync.bump();
     }
 
     template<> template<>
diff --git a/indra/llcommon/tests/lleventdispatcher_test.cpp b/indra/llcommon/tests/lleventdispatcher_test.cpp
index 44f772e322..be05ca4e85 100644
--- a/indra/llcommon/tests/lleventdispatcher_test.cpp
+++ b/indra/llcommon/tests/lleventdispatcher_test.cpp
@@ -17,13 +17,13 @@
 // std headers
 // external library headers
 // other Linden headers
+#include "StringVec.h"
 #include "../test/lltut.h"
 #include "lleventfilter.h"
 #include "llsd.h"
 #include "llsdutil.h"
 #include "llevents.h"
 #include "stringize.h"
-#include "StringVec.h"
 #include "tests/wrapllerrs.h"
 #include "../test/catch_and_store_what_in.h"
 #include "../test/debug.h"
diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
index d7b80e2545..9ca1ca4e2e 100644
--- a/indra/llcommon/tests/lleventfilter_test.cpp
+++ b/indra/llcommon/tests/lleventfilter_test.cpp
@@ -34,10 +34,10 @@
 // std headers
 // external library headers
 // other Linden headers
+#include "listener.h"
 #include "../test/lltut.h"
 #include "stringize.h"
 #include "llsdutil.h"
-#include "listener.h"
 #include "tests/wrapllerrs.h"
 
 #include <typeinfo>
@@ -51,6 +51,7 @@
 // as we've carefully put all functionality except actual LLTimer calls into
 // LLEventTimeoutBase, that should suffice. We're not not not trying to test
 // LLTimer here.
+#if 0                               // time testing needs reworking
 class TestEventTimeout: public LLEventTimeoutBase
 {
 public:
@@ -151,6 +152,7 @@ public:
     F32 mAlarmRemaining, mTimerRemaining;
     LLEventTimeoutBase::Action mAlarmAction;
 };
+#endif  // time testing needs reworking
 
 /*****************************************************************************
 *   TUT
@@ -220,6 +222,8 @@ namespace tut
     void filter_object::test<2>()
     {
         set_test_name("LLEventTimeout::actionAfter()");
+        skip("time testing needs reworking");
+#if 0                               // time testing needs reworking
         LLEventPump& driver(pumps.obtain("driver"));
         TestEventTimeout filter(driver);
         listener0.reset(0);
@@ -285,12 +289,15 @@ namespace tut
         filter.forceTimeout();
         mainloop.post(17);
         check_listener("no timeout 6", listener1, LLSD(0));
+#endif  // time testing needs reworking
     }
 
     template<> template<>
     void filter_object::test<3>()
     {
         set_test_name("LLEventTimeout::eventAfter()");
+        skip("time testing needs reworking");
+#if 0                               // time testing needs reworking
         LLEventPump& driver(pumps.obtain("driver"));
         TestEventTimeout filter(driver);
         listener0.reset(0);
@@ -322,12 +329,15 @@ namespace tut
         filter.forceTimeout();
         mainloop.post(17);
         check_listener("no timeout 3", listener0, LLSD(0));
+#endif  // time testing needs reworking
     }
 
     template<> template<>
     void filter_object::test<4>()
     {
         set_test_name("LLEventTimeout::errorAfter()");
+        skip("time testing needs reworking");
+#if 0                               // time testing needs reworking
         WrapLLErrs capture;
         LLEventPump& driver(pumps.obtain("driver"));
         TestEventTimeout filter(driver);
@@ -362,12 +372,15 @@ namespace tut
         filter.forceTimeout();
         mainloop.post(17);
         check_listener("no timeout 3", listener0, LLSD(0));
+#endif  // time testing needs reworking
     }
 
     template<> template<>
     void filter_object::test<5>()
     {
         set_test_name("LLEventThrottle");
+        skip("time testing needs reworking");
+#if 0                               // time testing needs reworking
         TestEventThrottle throttle(3);
         Concat cat;
         throttle.listen("concat", boost::ref(cat));
@@ -403,6 +416,7 @@ namespace tut
         throttle.advance(5);
         throttle.post(";17");
         ensure_equals("17", cat.result, "136;12;17"); // "17" delivered
+#endif  // time testing needs reworking
     }
 
     template<class PUMP>
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 3fb25b4cef..773b373e72 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -18,6 +18,7 @@
 #include <functional>
 // external library headers
 // other Linden headers
+#include "StringVec.h"
 #include "../test/lltut.h"
 #include "../test/namedtempfile.h"
 #include "../test/catch_and_store_what_in.h"
@@ -26,7 +27,6 @@
 #include "llprocess.h"
 #include "llstring.h"
 #include "stringize.h"
-#include "StringVec.h"
 
 #if defined(LL_WINDOWS)
 #define sleep(secs) _sleep((secs) * 1000)
@@ -300,8 +300,8 @@ namespace tut
         std::string threw = catch_what<LLLeap::Error>([&BADPYTHON](){
                 LLLeap::create("bad exe", BADPYTHON);
             });
-        ensure_contains("LLLeap::create() didn't throw", threw, "failed");
-        log.messageWith("failed");
+        ensure_contains("LLLeap::create() didn't throw", threw, "Can't find");
+        log.messageWith("Can't find");
         log.messageWith(BADPYTHON);
         // try the suppress-exception variant
         ensure("bad launch returned non-NULL", ! LLLeap::create("bad exe", BADPYTHON, false));
@@ -385,8 +385,7 @@ namespace tut
                                 "result = '' if resp == dict(pump=replypump(), data='ack')\\\n"
                                 "            else 'bad: ' + str(resp)\n"
                                 "send(pump='" << result.getName() << "', data=result)\n";});
-        waitfor(LLLeap::create(get_test_name(),
-                               StringVec{PYTHON, script.getName()}));
+        waitfor(LLLeap::create(get_test_name(), StringVec{PYTHON, script.getName()}));
         result.ensure();
     }
 
diff --git a/indra/llcommon/tests/llmainthreadtask_test.cpp b/indra/llcommon/tests/llmainthreadtask_test.cpp
index 9ccf391327..ea4232ad78 100644
--- a/indra/llcommon/tests/llmainthreadtask_test.cpp
+++ b/indra/llcommon/tests/llmainthreadtask_test.cpp
@@ -20,8 +20,8 @@
 // other Linden headers
 #include "../test/lltut.h"
 #include "../test/sync.h"
+#include "llcallbacklist.h"
 #include "llthread.h"               // on_main_thread()
-#include "lleventtimer.h"
 #include "lockstatic.h"
 
 /*****************************************************************************
@@ -108,7 +108,7 @@ namespace tut
             lk.unlock();
             // run the task -- should unblock thread, which will immediately block
             // on mSync
-            LLEventTimer::updateClass();
+            LLCallbackList::instance().callFunctions();
             // 'lk', having unlocked, can no longer be used to access; relock with
             // a new LockStatic instance
             ensure("should now have run", LockStatic()->ran);
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 6e8422ca0c..9b3b345217 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -259,6 +259,7 @@ public:
     }
 
     std::string getName() const { return mPath.string(); }
+    std::string getNormalName() const { return mPath.lexically_normal().make_preferred().string(); }
 
 private:
     boost::filesystem::path mPath;
@@ -590,7 +591,7 @@ namespace tut
                                  "    f.write(os.path.normcase(os.path.normpath(os.getcwd())))\n");
         // Before running, call setWorkingDirectory()
         py.mParams.cwd = tempdir.getName();
-        std::string expected{ tempdir.getName() };
+        std::string expected{ tempdir.getNormalName() };
 #if LL_WINDOWS
         // SIGH, don't get tripped up by "C:" != "c:" --
         // but on the Mac, using tolower() fails because "/users" != "/Users"!
diff --git a/indra/llcommon/tests/llrand_test.cpp b/indra/llcommon/tests/llrand_test.cpp
index a0dd4ef576..85dd53ce96 100644
--- a/indra/llcommon/tests/llrand_test.cpp
+++ b/indra/llcommon/tests/llrand_test.cpp
@@ -38,7 +38,7 @@
 // testing extent < 0, negate the return value and the extent before passing
 // into ensure_in_range().
 template <typename NUMBER>
-void ensure_in_range(const std::string_view& name,
+void ensure_in_range(std::string_view name,
                      NUMBER value, NUMBER low, NUMBER high)
 {
     auto failmsg{ stringize(name, " >= ", low, " (", value, ')') };
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index fae9f7023f..ff0607f503 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -44,19 +44,17 @@ typedef U32 uint32_t;
 #include "llstring.h"
 #endif
 
-#include "boost/range.hpp"
-
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "llsdutil.h"
 #include "llformat.h"
 #include "llmemorystream.h"
 
-#include "../test/hexdump.h"
+#include "hexdump.h"
+#include "StringVec.h"
 #include "../test/lltut.h"
 #include "../test/namedtempfile.h"
 #include "stringize.h"
-#include "StringVec.h"
 #include <functional>
 
 typedef std::function<void(const LLSD& data, std::ostream& str)> FormatterFunction;
@@ -1921,12 +1919,12 @@ namespace tut
             int bufflen{ static_cast<int>(buffstr.length()) };
             out.write(reinterpret_cast<const char*>(&bufflen), sizeof(bufflen));
             LL_DEBUGS() << "Wrote length: "
-                        << hexdump(reinterpret_cast<const char*>(&bufflen),
-                                   sizeof(bufflen))
+                        << LL::hexdump(reinterpret_cast<const char*>(&bufflen),
+                                       sizeof(bufflen))
                         << LL_ENDL;
             out.write(buffstr.c_str(), buffstr.length());
             LL_DEBUGS() << "Wrote data:   "
-                        << hexmix(buffstr.c_str(), buffstr.length())
+                        << LL::hexmix(buffstr.c_str(), buffstr.length())
                         << LL_ENDL;
         }
     }
@@ -2097,7 +2095,8 @@ namespace tut
         NamedTempFile file("llsd", "");
 
         python("Python " + pyformatter,
-               [&](std::ostream& out){ out <<
+               [pyformatter, &file](std::ostream& out) {
+               out <<
                import_llsd <<
                "import struct\n"
                "lenformat = struct.Struct('i')\n"
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index adf5804272..91304b4885 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -240,12 +240,14 @@ namespace tut
                 PSing1::initParamSingleton("again");
             });
         ensure_contains("second ctor(string) didn't throw", threw, "twice");
+#ifndef LL_GNUC // FIXME: Fails to build under GCC
         // try to initialize using the other constructor -- should be
         // well-formed, but illegal at runtime
         threw = catcherr.catch_llerrs([](){
                 PSing1::initParamSingleton(17);
             });
         ensure_contains("other ctor(int) didn't throw", threw, "twice");
+#endif
         PSing1::deleteSingleton();
         ensure("false negative on wasDeleted()", PSing1::wasDeleted());
         threw = catcherr.catch_llerrs([](){
@@ -254,6 +256,7 @@ namespace tut
         ensure_contains("accessed deleted LLParamSingleton", threw, "deleted");
     }
 
+#ifndef LL_GNUC // FIXME: Fails to build under GCC
     template<> template<>
     void singleton_object_t::test<13>()
     {
@@ -275,6 +278,7 @@ namespace tut
             });
         ensure_contains("other ctor(string) didn't throw", threw, "twice");
     }
+#endif
 
     class CircularPCtor: public LLParamSingleton<CircularPCtor>
     {