diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-04-19 08:02:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-04-20 01:03:10 (GMT) |
| commit | 70f42ced8e01ddf0098b143e5804c22d55ebf16f (patch) | |
| tree | 72d0334052c1d851d4a4d974374ea11d8a57337e | |
| parent | bf1d860143ff40330c6e8f3e2872f2ae812adaa7 (diff) | |
| download | Qt-70f42ced8e01ddf0098b143e5804c22d55ebf16f.zip Qt-70f42ced8e01ddf0098b143e5804c22d55ebf16f.tar.gz Qt-70f42ced8e01ddf0098b143e5804c22d55ebf16f.tar.bz2 | |
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
| -rw-r--r-- | tests/auto/qatomicint/tst_qatomicint.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qatomicpointer/tst_qatomicpointer.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp index 717187a..5ccb997 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); diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp index af8fabc..05f8294 100644 --- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp @@ -98,8 +98,7 @@ struct WFHC void tst_QAtomicPointer::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."); QBasicAtomicPointer<WFHC> p = Q_BASIC_ATOMIC_INITIALIZER(0); |