aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Rick Walsh <rickmwalsh@gmail.com>2015-08-30 15:40:34 +1000
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-30 09:14:58 -0700
commitd15a1db42846c4bee895baa9f490985c7136e0b8 (patch)
tree3d404e51c446ab156f4e2226e75150c3b19cccb4
parentd22a135343361a8243beb335ea89d5a9934a9347 (diff)
downloadsubsurface-d15a1db42846c4bee895baa9f490985c7136e0b8.tar.gz
TestPlan: Do not re-declare bool result
Fixing this error makes TestPlan pass again. Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--tests/testplan.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/testplan.cpp b/tests/testplan.cpp
index 56d511b55..a7ec2dc33 100644
--- a/tests/testplan.cpp
+++ b/tests/testplan.cpp
@@ -204,7 +204,7 @@ bool compareDecoTime(int actualRunTimeSeconds, int benchmarkRunTimeSeconds, int
// If the calculated run time equals the expected run time, do a simple comparison
if (actualRunTimeSeconds == benchmarkRunTimeSeconds) {
- bool result = true;
+ result = true;
} else {
/* We want the difference between the expected and calculated total run time to be not more than
* 1% of total run time + 1 minute */
@@ -219,7 +219,7 @@ bool compareDecoTime(int actualRunTimeSeconds, int benchmarkRunTimeSeconds, int
permilDifferenceAllowed * 0.1, absoluteDifferenceAllowedSeconds, totalDifferenceAllowed);
qInfo("total difference = %d seconds", totalDifference);
- bool result = (totalDifference <= totalDifferenceAllowed);
+ result = (totalDifference <= totalDifferenceAllowed);
}
if ((knownSsrfRunTimeSeconds > 0) && (actualRunTimeSeconds != knownSsrfRunTimeSeconds)) {
QWARN("Calculated run time does not match known Subsurface runtime");