summaryrefslogtreecommitdiffstats
path: root/tests/auto/qatomicint
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-19 18:02:33 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:40 +1000
commit94a7d439f28f7c171274b801f2a329aa57189589 (patch)
tree1219a173bb8a1c54fed39350fec23098b862fae1 /tests/auto/qatomicint
parent3ac241a1d531a666d5a0f2e255ed85a6e7875675 (diff)
Remove Q_ASSERT from qatomicint/pointer autotests
Some code in these tests is not intended to be executed, but rather to detect compiler warnings. Instead of having an obscure fatal error if this code is run in a debug build, it now has a clear fatal error if run in any build. Change-Id: I1c9d27bb14ebf3313865b68e3e57668ba1d14e25 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 70f42ced8e01ddf0098b143e5804c22d55ebf16f)
Diffstat (limited to 'tests/auto/qatomicint')
-rw-r--r--tests/auto/qatomicint/tst_qatomicint.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp
index 717187a2a6..5ccb997290 100644
--- a/tests/auto/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/qatomicint/tst_qatomicint.cpp
@@ -116,8 +116,7 @@ tst_QAtomicInt::~tst_QAtomicInt()
void tst_QAtomicInt::warningFreeHelper()
{
- Q_ASSERT(false);
- // The code below is bogus, and shouldn't be run. We're looking for warnings, only.
+ qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only.");
QBasicAtomicInt i = Q_BASIC_ATOMIC_INITIALIZER(0);