Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Add expected failures for JSC-specific bugs
  Make autotest insensitive to exact JS error wording
  Fix typo in autotest
  Link expected failures to tasks

6 files changed, 48 insertions, 46 deletions

diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index 5286a5a..9ab8318 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -617,7 +617,7 @@ void tst_QScriptClass::newInstance()
     QScriptValue obj1 = eng.newObject(&cls);
     QVERIFY(!obj1.data().isValid());
     QVERIFY(obj1.prototype().strictlyEquals(cls.prototype()));
-    QEXPECT_FAIL("", "classname is not implemented", Continue);
+    QEXPECT_FAIL("", "QTBUG-17599: classname is not implemented", Continue);
     QCOMPARE(obj1.toString(), QString::fromLatin1("[object TestClass]"));
     QCOMPARE(obj1.scriptClass(), (QScriptClass*)&cls);
 
@@ -741,7 +741,7 @@ void tst_QScriptClass::getAndSetPropertyFromCpp()
         QCOMPARE(obj1.propertyFlags(foo2), foo2Pflags);
         QVERIFY(cls.lastQueryPropertyObject().strictlyEquals(obj1));
         QVERIFY(cls.lastQueryPropertyName() == foo2);
-        QEXPECT_FAIL("", "classObject.getOwnPropertyDescriptor() reads the property value", Continue);
+        QEXPECT_FAIL("", "QTBUG-17601: classObject.getOwnPropertyDescriptor() reads the property value", Continue);
         QVERIFY(!cls.lastPropertyObject().isValid());
         QVERIFY(cls.lastPropertyFlagsObject().strictlyEquals(obj1));
         QVERIFY(cls.lastPropertyFlagsName() == foo2);
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index 89c5330..62f899c 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -151,7 +151,7 @@ void tst_QScriptContextInfo::nativeFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 1);
         QCOMPARE(info.functionName(), QString());
         QCOMPARE(info.functionEndLineNumber(), -1);
@@ -183,7 +183,7 @@ void tst_QScriptContextInfo::scriptFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber + 1);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 2);
         QCOMPARE(info.functionName(), QString::fromLatin1("bar"));
         QCOMPARE(info.functionStartLineNumber(), lineNumber);
@@ -202,7 +202,7 @@ void tst_QScriptContextInfo::scriptFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber + 3);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 1);
         QCOMPARE(info.functionName(), QString());
         QCOMPARE(info.functionEndLineNumber(), -1);
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 589b3b1..2d7feee 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -470,10 +470,10 @@ void tst_QScriptEngine::newArray_HooliganTask233836()
 {
     QScriptEngine eng;
     {
+        // According to ECMA-262, this should cause a RangeError.
         QScriptValue ret = eng.evaluate("a = new Array(4294967295); a.push('foo')");
-        QVERIFY(ret.isNumber());
-        QCOMPARE(ret.toInt32(), 0);
-        QCOMPARE(eng.evaluate("a[4294967295]").toString(), QString::fromLatin1("foo"));
+        QEXPECT_FAIL("", "ECMA compliance bug in Array.prototype.push: https://bugs.webkit.org/show_bug.cgi?id=55033", Continue);
+        QVERIFY(ret.isError() && ret.toString().contains(QLatin1String("RangeError")));
     }
     {
         QScriptValue ret = eng.newArray(0xFFFFFFFF);
@@ -672,7 +672,8 @@ void tst_QScriptEngine::jsRegExp()
     QCOMPARE(r5.toString(), QString::fromLatin1("/foo/gim"));
     // In JSC, constructing a RegExp from another produces the same identical object.
     // This is different from SpiderMonkey and old back-end.
-    QVERIFY(r5.strictlyEquals(r));
+    QEXPECT_FAIL("", "RegExp copy-constructor should return a new object: https://bugs.webkit.org/show_bug.cgi?id=55040", Continue);
+    QVERIFY(!r5.strictlyEquals(r));
 
     QScriptValue r6 = rxCtor.construct(QScriptValueList() << "foo" << "bar");
     QVERIFY(r6.isError());
@@ -1316,7 +1317,7 @@ void tst_QScriptEngine::globalObjectProperties()
     QCOMPARE(global.propertyFlags("URIError"), QScriptValue::SkipInEnumeration);
     QVERIFY(global.property("Math").isObject());
     QVERIFY(!global.property("Math").isFunction());
-    QEXPECT_FAIL("", "[ECMA compliance] JSC sets DontDelete flag for Math object", Continue);
+    QEXPECT_FAIL("", "[ECMA compliance] JSC sets DontDelete flag for Math object: https://bugs.webkit.org/show_bug.cgi?id=55034", Continue);
     QCOMPARE(global.propertyFlags("Math"), QScriptValue::SkipInEnumeration);
 }
 
@@ -4201,7 +4202,8 @@ void tst_QScriptEngine::getterSetterThisObject_activation()
         // read
         eng.evaluate("act.__defineGetter__('x', function() { return this; })");
         QVERIFY(eng.evaluate("x === act").toBoolean());
-        QEXPECT_FAIL("", "Exotic overload (don't care for now)", Continue);
+        QEXPECT_FAIL("", "QTBUG-17605: Not possible to implement local variables as getter/setter properties", Abort);
+        QVERIFY(!eng.hasUncaughtException());
         QVERIFY(eng.evaluate("with (act) x").equals("foo"));
         QVERIFY(eng.evaluate("(function() { with (act) return x; })() === act").toBoolean());
         eng.evaluate("q = {}; with (act) with (q) x").equals(eng.evaluate("act"));
@@ -5332,7 +5334,7 @@ void tst_QScriptEngine::functionScopes()
         // top-level functions have only the global object in their scope
         QScriptValue fun = eng.evaluate("(function() {})");
         QVERIFY(fun.isFunction());
-        QEXPECT_FAIL("", "Function scope proxying is not implemented", Abort);
+        QEXPECT_FAIL("", "QScriptValue::scope() is internal, not implemented", Abort);
         QVERIFY(fun.scope().isObject());
         QVERIFY(fun.scope().strictlyEquals(eng.globalObject()));
         QVERIFY(!eng.globalObject().scope().isValid());
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index d89f9f1..065f099 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -1291,7 +1291,7 @@ void tst_QScriptEngineAgent::positionChange_1()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 8);
 
         // 5 + 6
@@ -1326,7 +1326,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(1).scriptId != spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 18);
     }
 
@@ -1345,7 +1345,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 11);
     }
 
@@ -1376,14 +1376,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
 
         // void(i)
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 31);
     }
 
@@ -1402,21 +1402,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 28);
 
         // ++i
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 28);
     }
 
@@ -1435,28 +1435,28 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 17);
 
         // do
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(4).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(4).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(4).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(4).columnNumber, 17);
     }
 
@@ -1487,7 +1487,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 15);
     }
 
@@ -1506,14 +1506,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 32);
 
         // continue
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 32);
     }
 
@@ -1556,7 +1556,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
     }
 
@@ -1575,14 +1575,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 38);
 
         // break
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 45);
     }
 
@@ -1607,21 +1607,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = e
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 29);
 
         // i = 2
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 48);
     }
 
@@ -1634,14 +1634,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = 3
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 46);
     }
 
@@ -1663,7 +1663,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 20);
     }
     delete spy;
@@ -2247,8 +2247,7 @@ void tst_QScriptEngineAgent::syntaxError()
         QCOMPARE(spy->at(i).scriptId, spy->at(0).scriptId);
         QVERIFY(!spy->at(i).hasExceptionHandler);
         QVERIFY(spy->at(i).value.isError());
-        QEXPECT_FAIL("","QTBUG-6137 There are other messages in JSC",Continue);
-        QCOMPARE(spy->at(i).value.toString(), QString("SyntaxError: Expected `}'"));
+        QVERIFY(spy->at(i).value.toString().contains(QLatin1String("SyntaxError")));
         QCOMPARE(spy->at(i).scriptId, spy->at(0).scriptId);
         i = 7;
         //exit script
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 1607bed..c53abcb 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -1008,8 +1008,9 @@ void tst_QScriptExtQObject::getSetStaticProperty_methodPersistence()
         QVERIFY(slot.isFunction());
         QScriptValue sameSlot = m_engine->evaluate("myObject.mySlot");
         QVERIFY(sameSlot.strictlyEquals(slot));
-        sameSlot = m_engine->evaluate("myObject[mySlot()]");
-        QEXPECT_FAIL("", "Signature-based method lookup creates new function wrapper object", Continue);
+        sameSlot = m_engine->evaluate("myObject['mySlot()']");
+        QVERIFY(sameSlot.isFunction());
+        QEXPECT_FAIL("", "QTBUG-17611: Signature-based method lookup creates new function wrapper object", Continue);
         QVERIFY(sameSlot.strictlyEquals(slot));
     }
 }
@@ -1103,7 +1104,7 @@ void tst_QScriptExtQObject::getSetDynamicProperty_doNotHideJSProperty()
     val.setProperty("x", 42);
     m_myObject->setProperty("x", 2222);
 
-    QEXPECT_FAIL("", "", Continue);
+    QEXPECT_FAIL("", "QTBUG-17612: Dynamic C++ property overrides JS property", Continue);
 
     // JS should see the original JS value
     QVERIFY(val.property("x").strictlyEquals(QScriptValue(m_engine, 42)));
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index b302eba..9014241 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1889,7 +1889,7 @@ void tst_QScriptValue::getSetProperty_gettersAndSetters()
         QCOMPARE(object.propertyFlags("foo") & ~QScriptValue::UserRange,
                  QScriptValue::PropertyGetter );
 
-        QEXPECT_FAIL("", "User-range flags are not retained for getter/setter properties", Continue);
+        QEXPECT_FAIL("", "QTBUG-17615: User-range flags are not retained for getter/setter properties", Continue);
         QCOMPARE(object.propertyFlags("foo"),
                  QScriptValue::PropertyGetter | QScriptValue::UserRange);
         object.setProperty("x", num);
@@ -2004,10 +2004,10 @@ void tst_QScriptValue::getSetProperty_gettersAndSettersThrowErrorJS()
     QScriptValue object = eng.evaluate("o");
     QVERIFY(!eng.hasUncaughtException());
     QScriptValue ret = object.property("foo");
-    QEXPECT_FAIL("", "Exception thrown from js function are not returned by the JSC port", Continue);
+    QEXPECT_FAIL("", "QTBUG-17616: Exception thrown from js function are not returned by the JSC port", Continue);
     QVERIFY(ret.isError());
     QVERIFY(eng.hasUncaughtException());
-    QEXPECT_FAIL("", "Exception thrown from js function are not returned by the JSC port", Continue);
+    QEXPECT_FAIL("", "QTBUG-17616: Exception thrown from js function are not returned by the JSC port", Continue);
     QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
     QCOMPARE(eng.uncaughtException().toString(), QLatin1String("Error: get foo"));
     eng.evaluate("Object"); // clear exception state...
@@ -2185,9 +2185,9 @@ void tst_QScriptValue::getSetProperty()
     }
     // should still be deletable from C++
     object.setProperty("undeletableProperty", QScriptValue());
-    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
+    QEXPECT_FAIL("", "QTBUG-17617: With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QVERIFY(!object.property("undeletableProperty").isValid());
-    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
+    QEXPECT_FAIL("", "QTBUG-17617: With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QCOMPARE(object.propertyFlags("undeletableProperty"), 0);
 
   // SkipInEnumeration