From cd582f841076010dac334427830763838c0996b8 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Mon, 2 Sep 2013 21:00:14 +0300 Subject: 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 --- tests/baselineserver/shared/qbaselinetest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/baselineserver') 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 } -- cgit v1.2.3