Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-04-23 14:59:55 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-04-23 15:04:29 +0300
commit8f51f60948cc56f14da7592f3528ef925babf1cc (patch)
tree0a63a5d2cba28c865f8647bde4419ffc361bf9d1 /tests/gtests
parent614621747ea214efc72a095fbef6695bf98a2bb4 (diff)
Fix T76005: BLI_task test failing after recent changes
This was an error in changes made to this test to accomodate the new reduce callback.
Diffstat (limited to 'tests/gtests')
-rw-r--r--tests/gtests/blenlib/BLI_task_test.cc28
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/gtests/blenlib/BLI_task_test.cc b/tests/gtests/blenlib/BLI_task_test.cc
index 1f8c092c66a..348aa7305f9 100644
--- a/tests/gtests/blenlib/BLI_task_test.cc
+++ b/tests/gtests/blenlib/BLI_task_test.cc
@@ -94,15 +94,16 @@ TEST(task, RangeIterPool)
/* Those checks should ensure us all items of the listbase were processed once, and only once -
* as expected. */
-
- int expected_sum = 0;
- for (int j = 0; j < num_tasks; j++) {
- for (int i = 0; i < NUM_ITEMS; i++) {
- // EXPECT_EQ(data[j][i], i);
- expected_sum += i;
+ {
+ int expected_sum = 0;
+ for (int j = 0; j < num_tasks; j++) {
+ for (int i = 0; i < NUM_ITEMS; i++) {
+ // EXPECT_EQ(data[j][i], i);
+ expected_sum += i;
+ }
}
+ EXPECT_EQ(sum, expected_sum);
}
- EXPECT_EQ(sum, expected_sum);
/* A pool can be re-used until it is freed. */
@@ -126,15 +127,16 @@ TEST(task, RangeIterPool)
/* Those checks should ensure us all items of the listbase were processed once, and only once -
* as expected. */
-
- for (int j = 0; j < num_tasks; j++) {
+ {
int expected_sum = 0;
- for (int i = 0; i < NUM_ITEMS; i++) {
- // EXPECT_EQ(data[j][i], i);
- expected_sum += i;
+ for (int j = 0; j < num_tasks; j++) {
+ for (int i = 0; i < NUM_ITEMS; i++) {
+ // EXPECT_EQ(data[j][i], i);
+ expected_sum += i;
+ }
}
+ EXPECT_EQ(sum, expected_sum);
}
- EXPECT_EQ(sum, expected_sum);
BLI_threadapi_exit();
}