commit 3f4735fafab6d92fd5c952ef2d683886b75c5d2b
author Yabin Cui <yabinc@google.com> Tue May 02 23:20:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 02 23:20:32 2017 +0000
tree 822e53b1a5ec2047f39a61ad3cea8ba0b303139d
parent 85408ef2daaf6149baf0f03d69d9376dbc8d8c54
parent ab4cddc32934678d836483a49992f053347a320d

Merge "Fix pthread_barrier_smoke test (part 2)."

tests/pthread_test.cpp

diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index fbf14c1..d64bc48 100755
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -1964,6 +1964,7 @@
       ASSERT_EQ(0, result);
     }
     int mask = arg->data->finished_mask.fetch_or(1 << arg->id);
+    mask |= 1 << arg->id;
     if (mask == ((1 << arg->data->thread_count) - 1)) {
       ASSERT_EQ(1, arg->data->serial_thread_count);
       arg->data->finished_iteration_count++;