diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-29 00:50:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-29 00:50:26 +0000 |
| commit | 32c8ae9de0e51ac64efcfd2e5da34382deee959e (patch) | |
| tree | 64dd4da58f847409b829259068cf8c88720ce062 | |
| parent | dc3fb119497382fc8d9c3b87c5ef8321141330dc (diff) | |
| parent | 6b3beb23d666b722deeb81672166766ad28e7340 (diff) | |
| download | android_bionic-32c8ae9de0e51ac64efcfd2e5da34382deee959e.tar.gz android_bionic-32c8ae9de0e51ac64efcfd2e5da34382deee959e.tar.bz2 android_bionic-32c8ae9de0e51ac64efcfd2e5da34382deee959e.zip | |
Merge "Fixes stdatomic.h test to match C11 spec"
| -rw-r--r-- | tests/stdatomic_test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/stdatomic_test.cpp b/tests/stdatomic_test.cpp index 44f5c7bdc..d41bfa92e 100644 --- a/tests/stdatomic_test.cpp +++ b/tests/stdatomic_test.cpp @@ -100,31 +100,31 @@ TEST(stdatomic, atomic_exchange) { TEST(stdatomic, atomic_compare_exchange) { atomic_int i; - atomic_int expected; + int expected; atomic_store(&i, 123); - atomic_store(&expected, 123); + expected = 123; ASSERT_TRUE(atomic_compare_exchange_strong(&i, &expected, 456)); ASSERT_FALSE(atomic_compare_exchange_strong(&i, &expected, 456)); - ASSERT_EQ(456, atomic_load(&expected)); + ASSERT_EQ(456, expected); atomic_store(&i, 123); - atomic_store(&expected, 123); + expected = 123; ASSERT_TRUE(atomic_compare_exchange_strong_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed)); ASSERT_FALSE(atomic_compare_exchange_strong_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed)); - ASSERT_EQ(456, atomic_load(&expected)); + ASSERT_EQ(456, expected); atomic_store(&i, 123); - atomic_store(&expected, 123); + expected = 123; ASSERT_TRUE(atomic_compare_exchange_weak(&i, &expected, 456)); ASSERT_FALSE(atomic_compare_exchange_weak(&i, &expected, 456)); - ASSERT_EQ(456, atomic_load(&expected)); + ASSERT_EQ(456, expected); atomic_store(&i, 123); - atomic_store(&expected, 123); + expected = 123; ASSERT_TRUE(atomic_compare_exchange_weak_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed)); ASSERT_FALSE(atomic_compare_exchange_weak_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed)); - ASSERT_EQ(456, atomic_load(&expected)); + ASSERT_EQ(456, expected); } TEST(stdatomic, atomic_fetch_add) { |