Re-enable tests/auto/qml/debugger

Enable the tests, make them compile, and QSKIP the ones that don't work
for now.

Change-Id: Iaa175a8160b219be4054e8b9f7a3edff90f56505
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 18 insertions, 3 deletions

diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
index bef8af15f6..d16ca047c0 100644
--- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
@@ -45,7 +45,7 @@
 using namespace QV4;
 using namespace QV4::Debugging;
 
-typedef void (*InjectedFunction)(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData);
+typedef QV4::ReturnedValue (*InjectedFunction)(const QV4::BuiltinFunction *, QV4::CallData *callData);
 Q_DECLARE_METATYPE(InjectedFunction)
 
 static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
@@ -363,6 +363,7 @@ void tst_qv4debugger::cleanup()
 
 void tst_qv4debugger::breakAnywhere()
 {
+    QSKIP("fixme");
     QString script =
             "var i = 42;\n"
             "var j = i + 1\n"
@@ -374,6 +375,7 @@ void tst_qv4debugger::breakAnywhere()
 
 void tst_qv4debugger::pendingBreakpoint()
 {
+    QSKIP("fixme");
     QString script =
             "var i = 42;\n"
             "var j = i + 1\n"
@@ -389,6 +391,7 @@ void tst_qv4debugger::pendingBreakpoint()
 
 void tst_qv4debugger::liveBreakPoint()
 {
+    QSKIP("fixme");
     QString script =
             "var i = 42;\n"
             "var j = i + 1\n"
@@ -417,6 +420,7 @@ void tst_qv4debugger::removePendingBreakPoint()
 
 void tst_qv4debugger::addBreakPointWhilePaused()
 {
+    QSKIP("fixme");
     QString script =
             "var i = 42;\n"
             "var j = i + 1\n"
@@ -436,9 +440,9 @@ void tst_qv4debugger::addBreakPointWhilePaused()
     QCOMPARE(state.lineNumber, 2);
 }
 
-static void someCall(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *)
+static QV4::ReturnedValue someCall(const QV4::BuiltinFunction *function, QV4::CallData *)
 {
-    static_cast<QV4Debugger *>(scope.engine->debugger())
+    static_cast<QV4Debugger *>(function->engine()->debugger())
             ->removeBreakPoint("removeBreakPointForNextInstruction", 2);
     RETURN_UNDEFINED();
 }
@@ -460,6 +464,7 @@ void tst_qv4debugger::removeBreakPointForNextInstruction()
 
 void tst_qv4debugger::conditionalBreakPoint()
 {
+    QSKIP("fixme");
     m_debuggerAgent->m_captureContextInfo = true;
     QString script =
             "function test() {\n"
@@ -486,6 +491,7 @@ void tst_qv4debugger::conditionalBreakPoint()
 
 void tst_qv4debugger::conditionalBreakPointInQml()
 {
+    QSKIP("fixme");
     QQmlEngine engine;
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(&engine);
     QV4Debugger *v4Debugger = new QV4Debugger(v4);
@@ -523,6 +529,7 @@ void tst_qv4debugger::conditionalBreakPointInQml()
 
 void tst_qv4debugger::readArguments()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -549,6 +556,7 @@ void tst_qv4debugger::readArguments()
 
 void tst_qv4debugger::readLocals()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -575,6 +583,7 @@ void tst_qv4debugger::readLocals()
 
 void tst_qv4debugger::readObject()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -633,6 +642,7 @@ void tst_qv4debugger::readObject()
 
 void tst_qv4debugger::readContextInAllFrames()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -692,6 +702,7 @@ void tst_qv4debugger::pauseOnThrow()
 
 void tst_qv4debugger::breakInCatch()
 {
+    QSKIP("fixme");
     QString script =
             "try {\n"
             "    throw 'catch...'\n"
@@ -711,6 +722,7 @@ void tst_qv4debugger::breakInCatch()
 
 void tst_qv4debugger::breakInWith()
 {
+    QSKIP("fixme");
     QString script =
             "with (42) {\n"
             "    console.log('give the answer');\n"
@@ -728,6 +740,7 @@ void tst_qv4debugger::breakInWith()
 
 void tst_qv4debugger::evaluateExpression()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -772,6 +785,7 @@ void tst_qv4debugger::evaluateExpression()
 
 void tst_qv4debugger::stepToEndOfScript()
 {
+    QSKIP("fixme");
     QFETCH(bool, redundantRefs);
     m_debuggerAgent->collector.setRedundantRefs(redundantRefs);
 
@@ -836,6 +850,7 @@ void tst_qv4debugger::lastLineOfConditional_data()
 
 void tst_qv4debugger::lastLineOfConditional()
 {
+    QSKIP("fixme");
     QFETCH(QString, head);
     QFETCH(QString, tail);
     QFETCH(int, breakPoint);