Fix: when running test more than once, the QtScript plugins (and additional

stuff) get reloaded into engine, which results in test failures. Now the
engine is reused when re-running same script, or recreated properly if
running a new script. Also reactivate QTUITEST_DEFAULT_AUT_ARGS to allow
running tests in Xephyr.

1 files changed, 5 insertions, 4 deletions

diff --git a/interpreter/qscriptsystemtest.h b/interpreter/qscriptsystemtest.h
index 9624fd0..bc270af 100644
--- a/interpreter/qscriptsystemtest.h
+++ b/interpreter/qscriptsystemtest.h
@@ -57,9 +57,9 @@ public:
     QScriptSystemTest();
     virtual ~QScriptSystemTest();
 
-    static QString loadInternalScript(QString const &name, QScriptEngine &engine, bool withParentObject = false);
-    static void loadBuiltins(QScriptEngine &engine);
-    static void importIntoGlobalNamespace(QScriptEngine&, QString const&);
+    static QString loadInternalScript(QString const &name, QScriptEngine *engine, bool withParentObject = false);
+    static void loadBuiltins(QScriptEngine *engine);
+    static void importIntoGlobalNamespace(QScriptEngine*, QString const&);
 
     virtual QString testCaseName() const;
     void scriptPositionChange(qint64, int, int);
@@ -82,6 +82,7 @@ public slots:
     void dumpEngine();
 
 protected:
+    virtual void initEngine(bool);
     virtual QString currentFile();
     virtual int currentLine();
     virtual void outputBacktrace();
@@ -98,7 +99,7 @@ protected:
 
 private:   
     QString filename;
-    QScriptEngine m_engine;
+    QScriptEngine *m_engine;
     QScriptEngineAgent *m_agent;
     int m_contextDepth;
     QList<QScriptValue> m_messageHandlers;