Add cmd to simulate testfail. Misc server improvements.

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index 8467672195..0c5d78742a 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -63,6 +63,8 @@ Q_OBJECT
 public:
     tst_Lancelot();
 
+    static bool simfail;
+
 private:
     ImageItem render(const ImageItem &item);
     void paint(QPaintDevice *device, const QStringList &script, const QString &filePath);
@@ -91,6 +93,8 @@ private slots:
 #endif
 };
 
+bool tst_Lancelot::simfail = false;
+
 tst_Lancelot::tst_Lancelot()
 {
 }
@@ -290,12 +294,36 @@ void tst_Lancelot::paint(QPaintDevice *device, const QStringList &script, const
 {
     QPainter p(device);
     PaintCommands pcmd(script, 800, 800);
+    //pcmd.setShouldDrawText(false);
     pcmd.setType(ImageType);
     pcmd.setPainter(&p);
     pcmd.setFilePath(filePath);
     pcmd.runCommands();
+
+    if (simfail) {
+        p.drawLine(0, 0, 800, 800);
+        simfail = false;
+    }
+
     p.end();
 }
 
+#define main rmain
 QTEST_MAIN(tst_Lancelot)
+#undef main
+
+int main(int argc, char *argv[])
+{
+    char *fargv[20];
+    int fargc = 0;
+    for (int i = 0; i < qMin(argc, 19); i++) {
+        if (!qstrcmp(argv[i], "-simfail"))
+            tst_Lancelot::simfail = true;
+        else
+            fargv[fargc++] = argv[i];
+    }
+    fargv[fargc] = 0;
+    return rmain(fargc, fargv);
+}
+
 #include "tst_lancelot.moc"