summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-11 17:42:49 -0800
committerThiago Macieira <thiago.macieira@intel.com>2014-12-20 07:37:12 +0100
commit36314ae75f2f13b6c93252dc2c93592bc0624296 (patch)
tree392041c334bebd46934ff4384ac776b380ea2a97 /tests/benchmarks/dbus
parent3148d0c7b403af1bd74a2082cdde61e6974b38c1 (diff)
Fix handling of subprocesses for QtDBus unit tests on Windows
The executables are not in the same dir as on Unix, so we need to use QFINDTESTDATA to find them. The DESTDIR setting prevents qmake from placing the executables in a "debug/" subdir. Change-Id: I1d6d10e6f6f109f55fd9809dcf83da0386f38772 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/benchmarks/dbus')
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/server/server.pro1
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp7
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.pro b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
index b38623b099..c913e90afb 100644
--- a/tests/benchmarks/dbus/qdbusperformance/server/server.pro
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
@@ -1,6 +1,7 @@
SOURCES = server.cpp
HEADERS = ../serverobject.h
TARGET = server
+DESTDIR = .
QT += dbus
QT -= gui
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
index 5b3be02c33..eff69fe24d 100644
--- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -80,11 +80,12 @@ void tst_QDBusPerformance::initTestCase()
&QTestEventLoop::instance(), SLOT(exitLoop()));
#ifdef Q_OS_WIN
- proc.start("server");
+# define EXE ".exe"
#else
- proc.start("./server/server");
+# define EXE ""
#endif
- QVERIFY(proc.waitForStarted());
+ proc.start(QFINDTESTDATA("server/server" EXE));
+ QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
QTestEventLoop::instance().enterLoop(5);
QVERIFY(con.interface()->isServiceRegistered(serviceName));