Fix tests

Mic92 · Jun 28, 2013 · 060b602 · 060b602
1 parent 492d55a
commit 060b602
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -78,10 +78,18 @@ QByteArray getClipboard(const QString &mime = QString("text/plain"))
     return (data != NULL) ? data->data(mime) : QByteArray();
 }
 
+void initTestProcess(QProcess *p)
+{
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    env.insert("COPYQ_TESTING", "1");
+    p->setProcessEnvironment(env);
+}
+
 int run(const Args &arguments = Args(), QByteArray *stdoutData = NULL, QByteArray *stderrData = NULL,
         const QByteArray &in = QByteArray())
 {
     QProcess p;
+    initTestProcess(&p);
     p.start( QApplication::applicationFilePath(), arguments );
 
     p.write(in);
@@ -447,9 +455,7 @@ bool Tests::startServer()
         m_server->deleteLater();
     m_server = new QProcess(this);
 
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("COPYQ_TESTING", "1");
-    m_server->setProcessEnvironment(env);
+    initTestProcess(m_server);
 
     m_server->start( QApplication::applicationFilePath(), QIODevice::ReadOnly );
     m_server->waitForStarted();