summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2011-01-21 15:29:05 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-01-21 15:30:25 (GMT)
commit00141ca67b6c20ecc8624bb9d1c70d97d34f544a (patch)
treed5c8c2c03346c4af7ce62fc392e5e56aee946f8e
parentacd04e69bd404657638d3a95eea3a5946008cf03 (diff)
downloadQt-00141ca67b6c20ecc8624bb9d1c70d97d34f544a.zip
Qt-00141ca67b6c20ecc8624bb9d1c70d97d34f544a.tar.gz
Qt-00141ca67b6c20ecc8624bb9d1c70d97d34f544a.tar.bz2
ignore the warning from auto-detach in destructor
we locked shm few line ago and didn't unlock it, so we expecting for this warning Merge-request: 1018 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
-rw-r--r--tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index 50205bc..0719576 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -358,7 +358,8 @@ void tst_QSharedMemory::lock()
QVERIFY(shm.lock());
QTest::ignoreMessage(QtWarningMsg, "QSharedMemory::lock: already locked");
QVERIFY(shm.lock());
- // don't lock forever
+ // we didn't unlock(), so ignore the warning from auto-detach in destructor
+ QTest::ignoreMessage(QtWarningMsg, "QSharedMemory::lock: already locked");
}
/*!