summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2020-03-26 17:51:06 -0400
committerNat Goodspeed <nat@lindenlab.com>2020-03-26 17:51:06 -0400
commitb793ab8619d8c52a099aa85fdd831990ca95c6f4 (patch)
tree672e622130a3ba529c9159c8cab3e5de34d64838 /indra
parent84a7ec90b306e55740608fe3097b00cef99aec12 (diff)
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.)
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/tests/llmainthreadtask_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llmainthreadtask_test.cpp b/indra/llcommon/tests/llmainthreadtask_test.cpp
index 8178aa629a..d1f455b008 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()
{