summaryrefslogtreecommitdiffstats
path: root/vespamalloc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-12-12 20:54:06 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-12-12 20:54:06 +0000
commitfc80c8957f4844703fa98354509078054aa0d847 (patch)
treeed90067cd879dbd5441d58e2b4f5db2fcaaf51ac /vespamalloc
parentcae5b663eb0806ffd0078dc69c54a549bf2003c7 (diff)
hmm, gcc 7 built from scratch and centos version behaves differently.
Diffstat (limited to 'vespamalloc')
-rw-r--r--vespamalloc/src/tests/test1/testatomic.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/vespamalloc/src/tests/test1/testatomic.cpp b/vespamalloc/src/tests/test1/testatomic.cpp
index 3b1adf08802..818af5fe673 100644
--- a/vespamalloc/src/tests/test1/testatomic.cpp
+++ b/vespamalloc/src/tests/test1/testatomic.cpp
@@ -14,7 +14,12 @@ TEST("verify lock freeness of atomics"){
{
std::atomic<vespamalloc::TaggedPtr> taggedPtr;
ASSERT_EQUAL(16u, sizeof(vespamalloc::TaggedPtr));
+#if __GNUC__ < 7
+ // See https://gcc.gnu.org/ml/gcc-patches/2017-01/msg02344.html for background
ASSERT_TRUE(taggedPtr.is_lock_free());
+#else
+ ASSERT_FALSE(taggedPtr.is_lock_free());
+#endif
}
}