summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2010-02-17 11:47:08 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2010-02-18 12:48:55 (GMT)
commitf07d97150549f6817c351643e1c8b0ff163803ac (patch)
tree730e92833b47a23f0dc3f7d0fd6d7eb5eb23cc5a /src/testlib
parentb63c596ef6a937a3ab99d8496b5e8b6260fe8aa7 (diff)
downloadQt-f07d97150549f6817c351643e1c8b0ff163803ac.zip
Qt-f07d97150549f6817c351643e1c8b0ff163803ac.tar.gz
Qt-f07d97150549f6817c351643e1c8b0ff163803ac.tar.bz2
Always accept values reported directly using QTest::setBenchmarkResult.
Reviewed-by: jasplin
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qbenchmark.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 52b5287..23c5639 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -159,7 +159,7 @@ void QBenchmarkTestMethodData::setResult(
if (QBenchmarkGlobalData::current->iterationCount != -1)
accepted = true;
- if (QBenchmarkTestMethodData::current->runOnce) {
+ if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
iterationCount = 1;
accepted = true;
}