[Bf-blender-cvs] [0fc97dc73d8] master: CTest: Fix Bli_task_test failing on windows.

Ray Molenkamp noreply at git.blender.org
Tue May 21 14:51:26 CEST 2019


Commit: 0fc97dc73d828b0f2dec16c67dc7a0153e04470f
Author: Ray Molenkamp
Date:   Tue May 21 06:51:24 2019 -0600
Branches: master
https://developer.blender.org/rB0fc97dc73d828b0f2dec16c67dc7a0153e04470f

CTest: Fix Bli_task_test failing on windows.

The task_scheduler was not being explicitly freed, leading to
unpredictable behavior when the process was exiting. The test
would pass, but would sometimes segfault at process shutdown.

===================================================================

M	tests/gtests/blenlib/BLI_task_test.cc

===================================================================

diff --git a/tests/gtests/blenlib/BLI_task_test.cc b/tests/gtests/blenlib/BLI_task_test.cc
index ed2fd60a3e9..96c6b572e19 100644
--- a/tests/gtests/blenlib/BLI_task_test.cc
+++ b/tests/gtests/blenlib/BLI_task_test.cc
@@ -27,6 +27,7 @@ static void task_mempool_iter_func(void *userdata, MempoolIterData *item)
 TEST(task, MempoolIter)
 {
   int *data[NUM_ITEMS];
+  BLI_threadapi_init();
   BLI_mempool *mempool = BLI_mempool_create(
       sizeof(*data[0]), NUM_ITEMS, 32, BLI_MEMPOOL_ALLOW_ITER);
 
@@ -76,4 +77,5 @@ TEST(task, MempoolIter)
   }
 
   BLI_mempool_destroy(mempool);
+  BLI_threadapi_exit();
 }



More information about the Bf-blender-cvs mailing list