diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 02:42:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 02:42:53 (GMT) |
| commit | 85b089dec584fcc51ad7703ea015ea724c132ed4 (patch) | |
| tree | c66161d861732ce48a121520931018f66bce7c64 | |
| parent | a2418eed6e4e5aabe1274c57c7fc279a66fa2333 (diff) | |
| parent | 637456edef085d1825f15429cd921f2f0d4bd6a2 (diff) | |
| download | Qt-85b089dec584fcc51ad7703ea015ea724c132ed4.zip Qt-85b089dec584fcc51ad7703ea015ea724c132ed4.tar.gz Qt-85b089dec584fcc51ad7703ea015ea724c132ed4.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Remove Q_ASSERT's from qsharedmemory autotest
| -rw-r--r-- | tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp index 6db84dd..647d857 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp @@ -207,7 +207,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp index f6803f7..f7e4ab2 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp @@ -157,7 +157,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } |