[Bf-blender-cvs] [8f51f60948c] master: Fix T76005: BLI_task test failing after recent changes

[Brecht Van Lommel]

Commit: 8f51f60948cc56f14da7592f3528ef925babf1cc
Author: Brecht Van Lommel
Date:   Thu Apr 23 13:59:55 2020 +0200
Branches: master
https://developer.blender.org/rB8f51f60948cc56f14da7592f3528ef925babf1cc

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.

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

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 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();
 }