diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-11 17:42:49 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-20 07:37:12 +0100 |
commit | 36314ae75f2f13b6c93252dc2c93592bc0624296 (patch) | |
tree | 392041c334bebd46934ff4384ac776b380ea2a97 /tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | |
parent | 3148d0c7b403af1bd74a2082cdde61e6974b38c1 (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/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp')
-rw-r--r-- | tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index e66b1134d4..81e3aa3292 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -266,13 +266,13 @@ void tst_QDBusInterface::initTestCase() | QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllInvokables); - // start peer server - #ifdef Q_OS_WIN - proc.start("qmyserver"); - #else - proc.start("./qmyserver/qmyserver"); - #endif - QVERIFY(proc.waitForStarted()); +#ifdef Q_OS_WIN +# define EXE ".exe" +#else +# define EXE "" +#endif + proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE)); + QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString())); WaitForQMyServer w; QVERIFY(w.ok()); |