Merge branch DRTVWR-589-luau into luau-scripting

LuaU scripting project

2 files changed, 31 insertions, 106 deletions

diff --git a/indra/test/hexdump.h b/indra/test/hexdump.h
deleted file mode 100644
index dd7cbaaa3c..0000000000
--- a/indra/test/hexdump.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @file   hexdump.h
- * @author Nat Goodspeed
- * @date   2023-09-08
- * @brief  Provide hexdump() and hexmix() ostream formatters
- * 
- * $LicenseInfo:firstyear=2023&license=viewerlgpl$
- * Copyright (c) 2023, Linden Research, Inc.
- * $/LicenseInfo$
- */
-
-#if ! defined(LL_HEXDUMP_H)
-#define LL_HEXDUMP_H
-
-#include <cctype>
-#include <iomanip>
-#include <iostream>
-#include <string_view>
-
-// Format a given byte string as 2-digit hex values, no separators
-// Usage: std::cout << hexdump(somestring) << ...
-class hexdump
-{
-public:
-    hexdump(const std::string_view& data):
-        hexdump(data.data(), data.length())
-    {}
-
-    hexdump(const char* data, size_t len):
-        hexdump(reinterpret_cast<const unsigned char*>(data), len)
-    {}
-
-    hexdump(const unsigned char* data, size_t len):
-        mData(data, data + len)
-    {}
-
-    friend std::ostream& operator<<(std::ostream& out, const hexdump& self)
-    {
-        auto oldfmt{ out.flags() };
-        auto oldfill{ out.fill() };
-        out.setf(std::ios_base::hex, std::ios_base::basefield);
-        out.fill('0');
-        for (auto c : self.mData)
-        {
-            out << std::setw(2) << unsigned(c);
-        }
-        out.setf(oldfmt, std::ios_base::basefield);
-        out.fill(oldfill);
-        return out;
-    }
-
-private:
-    std::vector<unsigned char> mData;
-};
-
-// Format a given byte string as a mix of printable characters and, for each
-// non-printable character, "\xnn"
-// Usage: std::cout << hexmix(somestring) << ...
-class hexmix
-{
-public:
-    hexmix(const std::string_view& data):
-        mData(data)
-    {}
-
-    hexmix(const char* data, size_t len):
-        mData(data, len)
-    {}
-
-    friend std::ostream& operator<<(std::ostream& out, const hexmix& self)
-    {
-        auto oldfmt{ out.flags() };
-        auto oldfill{ out.fill() };
-        out.setf(std::ios_base::hex, std::ios_base::basefield);
-        out.fill('0');
-        for (auto c : self.mData)
-        {
-            // std::isprint() must be passed an unsigned char!
-            if (std::isprint(static_cast<unsigned char>(c)))
-            {
-                out << c;
-            }
-            else
-            {
-                out << "\\x" << std::setw(2) << unsigned(c);
-            }
-        }
-        out.setf(oldfmt, std::ios_base::basefield);
-        out.fill(oldfill);
-        return out;
-    }
-
-private:
-    std::string mData;
-};
-
-#endif /* ! defined(LL_HEXDUMP_H) */
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 40243a8ad6..027db50693 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -45,6 +45,7 @@
 #include "llcommon.h"
 #include "lluuid.h"
 #include "llinstantmessage.h"
+#include "stringize.h"
 
 namespace tut
 {
@@ -1116,6 +1117,9 @@ namespace tut
 	template<> template<>
 	void fitness_test_object::test<5>()
 	{
+		skip("Test is strongly timing dependent, "
+			 "and on slow CI machines it fails way too often.");
+		const int retries = 100;
 		// Set up the server
 		LLPumpIO::chain_t chain;
 		typedef LLCloneIOFactory<LLIOSleeper> sleeper_t;
@@ -1129,9 +1133,12 @@ namespace tut
 		chain.push_back(LLIOPipe::ptr_t(server));
 		mPump->addChain(chain, NEVER_CHAIN_EXPIRY_SECS);
 		// We need to tickle the pump a little to set up the listen()
-		pump_loop(mPump, 0.1f);
+		for (int retry = 0; mPump->runningChains() < 1 && retry < retries; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		U32 count = mPump->runningChains();
-		ensure_equals("server chain onboard", count, 1);
+		ensure_equals("server chain 1 onboard", count, 1);
 		LL_DEBUGS() << "** Server is up." << LL_ENDL;
 
 		// Set up the client
@@ -1140,9 +1147,12 @@ namespace tut
 		bool connected = client->blockingConnect(server_host);
 		ensure("Connected to server", connected);
 		LL_DEBUGS() << "connected" << LL_ENDL;
-		pump_loop(mPump,0.1f);
+		for (int retry = 0; mPump->runningChains() < 2 && retry < retries; ++retry)
+		{
+			pump_loop(mPump,0.1f);
+		}
 		count = mPump->runningChains();
-		ensure_equals("server chain onboard", count, 2);
+		ensure_equals("server chain 2 onboard", count, 2);
 		LL_DEBUGS() << "** Client is connected." << LL_ENDL;
 
 		// We have connected, since the socket reader does not block,
@@ -1156,20 +1166,32 @@ namespace tut
 		chain.clear();
 
 		// pump for a bit and make sure all 3 chains are running
-		pump_loop(mPump,0.1f);
+		for (int retry = 0; mPump->runningChains() < 3 && retry < retries; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		count = mPump->runningChains();
-		// ensure_equals("client chain onboard", count, 3); commented out because it fails frequently - appears to be timing sensitive
+		ensure_equals("client chain onboard", count, 3);
 		LL_DEBUGS() << "** request should have been sent." << LL_ENDL;
 
 		// pump for long enough the the client socket closes, and the
 		// server socket should not be closed yet.
-		pump_loop(mPump,0.2f);
+		for (int retry = 0; mPump->runningChains() == 3 && retry < retries; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
+		// We used to test for count == 2 here, but on a slow test machine it
+		// can happen that not just one but two chains close before we reach
+		// this point.
 		count = mPump->runningChains();
-		ensure_equals("client chain timed out ", count, 2);
+		ensure(stringize("client chain timed out: count ", count), count < 3);
 		LL_DEBUGS() << "** client chain should be closed." << LL_ENDL;
 
 		// At this point, the socket should be closed by the timeout
-		pump_loop(mPump,1.0f);
+		for (int retry = 0; mPump->runningChains() > 1 && retry < retries; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		count = mPump->runningChains();
 		ensure_equals("accepted socked close", count, 1);
 		LL_DEBUGS() << "** Sleeper should have timed out.." << LL_ENDL;