summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptengine
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-07-10 06:36:55 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-07-10 06:36:55 (GMT)
commit0579f4be2e79bb95c963a7e2368b6ee797c25e90 (patch)
tree24befe9608c1f7cfb805c87d571064b2493660c5 /tests/auto/qscriptengine
parentb578be0bcf206694072c8431905e427f7b1172d8 (diff)
downloadQt-0579f4be2e79bb95c963a7e2368b6ee797c25e90.zip
Qt-0579f4be2e79bb95c963a7e2368b6ee797c25e90.tar.gz
Qt-0579f4be2e79bb95c963a7e2368b6ee797c25e90.tar.bz2
some small fixes/experiments
Diffstat (limited to 'tests/auto/qscriptengine')
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 8e85f90..e29e834 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -158,7 +158,7 @@ void tst_QScriptEngine::currentContext()
QVERIFY(globalCtx->thisObject().strictlyEquals(eng.globalObject()));
QEXPECT_FAIL("", "", Continue);
QVERIFY(globalCtx->activationObject().strictlyEquals(eng.globalObject()));
- QSKIP("Crashes", SkipAll);
+ QEXPECT_FAIL("", "", Continue);
QVERIFY(globalCtx->argumentsObject().isObject());
}
@@ -3016,6 +3016,7 @@ void tst_QScriptEngine::getterSetterThisObject()
{
QScriptEngine eng;
QScriptContext *ctx = eng.pushContext();
+ QVERIFY(ctx != 0);
QScriptValue act = ctx->activationObject();
act.setProperty("act", act);
// read