diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /tests/benchmarks | |
parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp index 05a15750c1..05e184d0c2 100644 --- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp @@ -151,7 +151,6 @@ void tst_QMutex::noThread_data() QTest::addColumn<int>("t"); QTest::newRow("noLock") << 1; - QTest::newRow("QMutexInline") << 2; QTest::newRow("QMutex") << 3; QTest::newRow("QMutexLocker") << 4; } @@ -172,16 +171,6 @@ void tst_QMutex::noThread() } } break; - case 2: - QBENCHMARK { - count = 0; - for (int i = 0; i < N; i++) { - mtx.lockInline(); - count++; - mtx.unlockInline(); - } - } - break; case 3: QBENCHMARK { count = 0; |