diff options
author | Andrew Knight <andrew.knight@digia.com> | 2013-09-02 21:00:14 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-03 08:42:24 +0200 |
commit | cd582f841076010dac334427830763838c0996b8 (patch) | |
tree | 42cf3aa63d8f9c4ce15c960788e4b973cb436048 /tests/baselineserver | |
parent | 5bd6a4b71a5eeb88ccc2f0fd1515deeeb92e1b53 (diff) |
Add QT_NO_PROCESS guards in tests where they are missing
A handful of tests lack QT_NO_PROCESS guards, making them non-compilable
on Qt builds with no QProcess support. This commit does not change
QProcess-specific tests, which should be left out of the build using the
.pro file mechanism.
Change-Id: Iac8562428abc1f59ccbb23bf5c3a919785e41f12
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/baselineserver')
-rw-r--r-- | tests/baselineserver/shared/qbaselinetest.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/baselineserver/shared/qbaselinetest.cpp b/tests/baselineserver/shared/qbaselinetest.cpp index 2b2ae95e27..a9c0018841 100644 --- a/tests/baselineserver/shared/qbaselinetest.cpp +++ b/tests/baselineserver/shared/qbaselinetest.cpp @@ -139,6 +139,9 @@ void addClientProperty(const QString& key, const QString& value) */ void fetchCustomClientProperties() { +#ifdef QT_NO_PROCESS + QSKIP("This test requires QProcess support"); +#else QString script = "hostinfo.sh"; //### TBD: Windows implementation (hostinfo.bat) QProcess runScript; @@ -161,6 +164,7 @@ void fetchCustomClientProperties() else qDebug() << "Unparseable script output ignored:" << line; } +#endif // !QT_NO_PROCESS } |