aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2011-11-25 11:41:04 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-28 01:20:45 +0100
commitfa2ec635aa77965dee617ea804947dcb557bde2e (patch)
tree12e2733fabaef6bd0b212ca556a166958ad5a030
parentf98ebe34e17fcf955a77b35b098b5be81dc6c7d8 (diff)
qmltestrunner reports wrong LOC for failed test cases
The callerFile() and callerLine() calls GetFrame() with incorrect index, the right index should be the current frame index + 1. Task-number:QTBUG-22887 Change-Id: I694073b80853bf66e02414a158c8e155f8be8390 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
-rw-r--r--src/imports/testlib/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index c78a1c4d75..c7d7d9191e 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -108,8 +108,8 @@ public Q_SLOTS:
{
v8::Local<v8::StackTrace> stacks = v8::StackTrace::CurrentStackTrace(10, v8::StackTrace::kDetailed);
int count = stacks->GetFrameCount();
- if (count >= frameIndex + 2) {
- v8::Local<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 2);
+ if (count >= frameIndex + 1) {
+ v8::Local<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 1);
return QDeclarativeV8Handle::fromHandle(frame->GetScriptNameOrSourceURL());
}
return QDeclarativeV8Handle();
@@ -118,8 +118,8 @@ public Q_SLOTS:
{
v8::Local<v8::StackTrace> stacks = v8::StackTrace::CurrentStackTrace(10, v8::StackTrace::kDetailed);
int count = stacks->GetFrameCount();
- if (count >= frameIndex + 2) {
- v8::Local<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 2);
+ if (count >= frameIndex + 1) {
+ v8::Local<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 1);
return frame->GetLineNumber();
}
return -1;