summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-10 09:34:22 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-10 09:34:22 (GMT)
commit65a400084b888b12165a47b3474412c080b1422d (patch)
tree8c7190d5278bdcd43a05b22cbaf47343c504cb44
parent80b91eeb991bd6962feb4bdb1f492fcd807389a0 (diff)
downloadQt-65a400084b888b12165a47b3474412c080b1422d.zip
Qt-65a400084b888b12165a47b3474412c080b1422d.tar.gz
Qt-65a400084b888b12165a47b3474412c080b1422d.tar.bz2
make the global object properties test pass
Accept the presence of a JSON object.
-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 896a860..f7dc924 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1054,6 +1054,8 @@ void tst_QScriptEngine::globalObjectProperties()
<< "gc"
<< "version"
<< "print"
+ // JavaScriptCore
+ << "JSON"
;
QSet<QString> actualNames;
{
@@ -1073,7 +1075,6 @@ void tst_QScriptEngine::globalObjectProperties()
remainingNames.remove(name);
}
}
- QEXPECT_FAIL("", "JSC global object has extra properties (JSON and jscprint)", Abort);
QVERIFY(remainingNames.isEmpty());
}