aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-04-08 06:58:51 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-08 06:58:52 -0700
commit2c4bd0798e929acb9663668985eabe74d7378c46 (patch)
tree228e7970c5ab59b655726a28ffc9849a9b8746eb /tests
parent6a5d7139ff17a2dfdf136de35f7dd9c94c1f648b (diff)
Convert SkRefCnt to std::atomic.
This enables removing the more complicated atomic shims from SkAtomics.h. TBR=reed This doesn't actually change any API. CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN-Trybot,Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-TSAN-Trybot Review URL: https://codereview.chromium.org/1867863002
Diffstat (limited to 'tests')
-rw-r--r--tests/RefCntTest.cpp2
-rw-r--r--tests/TLSTest.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index a9b461f352..36915932b3 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -71,7 +71,7 @@ static void test_weakRefCnt(skiatest::Reporter* reporter) {
thing4.join();
REPORTER_ASSERT(reporter, ref->unique());
- REPORTER_ASSERT(reporter, ref->getWeakCnt() == 1);
+ SkDEBUGCODE(REPORTER_ASSERT(reporter, ref->getWeakCnt() == 1));
ref->unref();
}
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index c398c6c019..2702d9c000 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+#include "SkAtomics.h"
#include "SkGraphics.h"
#include "SkPaint.h"
#include "SkTLS.h"