summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptcontext
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-08-11 07:35:50 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-08-11 07:44:24 (GMT)
commit81d8292e486bce768d9af27e3510520a769c4fa8 (patch)
treef2925d15dc89a6bb64b34ecf162d6ac9fa5e312d /tests/auto/qscriptcontext
parent62281ca6f9e74a5c8b66204d74ceec0215ecab92 (diff)
downloadQt-81d8292e486bce768d9af27e3510520a769c4fa8.zip
Qt-81d8292e486bce768d9af27e3510520a769c4fa8.tar.gz
Qt-81d8292e486bce768d9af27e3510520a769c4fa8.tar.bz2
Fix line number and arguments in QScriptContext::toString
For arguments, we always need to skip the implicit 'this' argument For line number, we walk thought the stack frames from the top to find the one above the requested one, which contains the returnPC we need. Also fixed a crash because QScriptContext::parentContext would have returned a pointer with flags inside. Reviewed-by: Kent Hansen
Diffstat (limited to 'tests/auto/qscriptcontext')
-rw-r--r--tests/auto/qscriptcontext/tst_qscriptcontext.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index a278d2c..be0b2b7 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -791,7 +791,6 @@ void tst_QScriptContext::toString()
" return parentContextToString();\n"
"}; foo(1, 2, 3)", "script.qs");
QVERIFY(ret.isString());
- QEXPECT_FAIL("", "", Continue);
QCOMPARE(ret.toString(), QString::fromLatin1("foo (first=1, second=2, third=3) at script.qs:2"));
}