From b793ab8619d8c52a099aa85fdd831990ca95c6f4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 26 Mar 2020 17:51:06 -0400
Subject: [PATCH] DRTVWR-476: Apparently it can take more than 2s for threads
to chat.
llmainthreadtask_test builds in a Sync timeout to keep build-time tests from
hanging. That timeout was set to 2000ms, which seems as though it ought to be
plenty enough time for a process with only 2 threads to exchange data between
them. But on TeamCity EC2 Windows build hosts, sometimes we hit that timeout
and fail. Extend it to try to improve the robustness of builds, even though
the possibility of a production viewer blocking for that long for anything
seems worrisome. (Fortunately the production viewer does not use Sync.)
---
indra/llcommon/tests/llmainthreadtask_test.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/tests/llmainthreadtask_test.cpp b/indra/llcommon/tests/llmainthreadtask_test.cpp
index 8178aa629ad..d1f455b008b 100644
--- a/indra/llcommon/tests/llmainthreadtask_test.cpp
+++ b/indra/llcommon/tests/llmainthreadtask_test.cpp
@@ -31,8 +31,8 @@ namespace tut
{
struct llmainthreadtask_data
{
- // 2-second timeout
- Sync mSync{F32Milliseconds(2000.0f)};
+ // 5-second timeout
+ Sync mSync{F32Milliseconds(5000.0f)};
llmainthreadtask_data()
{
--
GitLab