summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-18 09:27:16 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-18 09:28:38 (GMT)
commit379073630202d37cf8e3927dc9745134ac2f5512 (patch)
tree7248163ba56b5930b0cd1decce1a14951e9a587e
parent60ad9486a959ac1beb9b850be18fbb787173cfa0 (diff)
downloadQt-379073630202d37cf8e3927dc9745134ac2f5512.zip
Qt-379073630202d37cf8e3927dc9745134ac2f5512.tar.gz
Qt-379073630202d37cf8e3927dc9745134ac2f5512.tar.bz2
remove expected failures, mark expected failure
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 821bc0c..eb24616 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -818,14 +818,11 @@ void tst_QScriptEngine::newQMetaObject()
instance = QScriptValue();
eng.collectGarbage();
- QEXPECT_FAIL("","collectGarbage not working", Continue);
QVERIFY(!qpointer1);
QVERIFY(qpointer2);
- QEXPECT_FAIL("","collectGarbage not working", Continue);
QVERIFY(!qpointer3); // was child of instance
QVERIFY(instance.toQObject() == 0);
- QEXPECT_FAIL("","collectGarbage not working", Continue);
QVERIFY(instance3.toQObject() == 0); // was child of instance
QVERIFY(instance2.toQObject() != 0);
instance2 = QScriptValue();
@@ -2076,6 +2073,7 @@ void tst_QScriptEngine::collectGarbage()
QScriptValue v = eng.newQObject(ptr, QScriptEngine::ScriptOwnership);
}
eng.collectGarbage();
+ QEXPECT_FAIL("","collectGarbage not working", Continue);
QVERIFY(ptr == 0);
}