diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
| commit | 98a431bd16e0e06f8f83b93fd232363403c6463b (patch) | |
| tree | 0e0bc8bc1c5ab18fda8ff5ba948c13b530c8a6cf /indra/llcommon/tests/workqueue_test.cpp | |
| parent | 69aa02d2e1873970302942487b96d3a6aca119e5 (diff) | |
| parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/llcommon/tests/workqueue_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/workqueue_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/tests/workqueue_test.cpp b/indra/llcommon/tests/workqueue_test.cpp index 1d73f7aa0d..7655a7aa1f 100644 --- a/indra/llcommon/tests/workqueue_test.cpp +++ b/indra/llcommon/tests/workqueue_test.cpp @@ -83,7 +83,11 @@ namespace tut // signal the work item that it can quit; consider LLOneShotCond. LLCond<Shared> data; auto start = WorkQueue::TimePoint::clock::now(); - auto interval = 100ms; + // 2s seems like a long time to wait, since it directly impacts the + // duration of this test program. Unfortunately GitHub's Mac runners + // are pretty wimpy, and we're getting spurious "too late" errors just + // because the thread doesn't wake up as soon as we want. + auto interval = 2s; queue.postEvery( interval, [&data, count = 0] |