summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-12-13 14:20:19 -0500
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 19:25:42 -0400
commitfa450ea8492f8d029b781bd911ad270d1b15a3ee (patch)
tree54d591c2553c3d5a26c52d1724db36f75fe7b1d2 /indra
parentc50db833656c424bb398cd91a46f478ca8b72b23 (diff)
DRTVWR-476: Update LLMainThreadTask tests for simpler API.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/tests/llmainthreadtask_test.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcommon/tests/llmainthreadtask_test.cpp b/indra/llcommon/tests/llmainthreadtask_test.cpp
index e54c7eda18..8178aa629a 100644
--- a/indra/llcommon/tests/llmainthreadtask_test.cpp
+++ b/indra/llcommon/tests/llmainthreadtask_test.cpp
@@ -75,14 +75,11 @@ namespace tut
// exceptions it might throw and deliver them via future
std::packaged_task<void()> thread_work(
[this, &result](){
- // lock static data first
- LockStatic lk;
// unblock test<2>()'s yield_until(1)
mSync.set(1);
// dispatch work to main thread -- should block here
bool on_main(
LLMainThreadTask::dispatch(
- lk, // unlock this before blocking!
[]()->bool{
// have to lock static mutex to set static data
LockStatic()->ran = true;