From 8f51f60948cc56f14da7592f3528ef925babf1cc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 23 Apr 2020 13:59:55 +0200 Subject: 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. --- tests/gtests/blenlib/BLI_task_test.cc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'tests/gtests') 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(); } -- cgit v1.2.3