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/auto/testlib/selftests/tst_selftests.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 441254c126..b737f823c8 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -489,6 +489,8 @@ void tst_Selftests::runSubTest_data() } } +#ifndef QT_NO_PROCESS + static void insertEnvironmentVariable(QString const& name, QProcessEnvironment &result) { const QProcessEnvironment systemEnvironment = QProcessEnvironment::systemEnvironment(); @@ -688,13 +690,19 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge } } +#endif // !QT_NO_PROCESS + void tst_Selftests::runSubTest() { +#ifdef QT_NO_PROCESS + QSKIP("This test requires QProcess support"); +#else QFETCH(QString, subdir); QFETCH(QStringList, loggers); QFETCH(QStringList, arguments); doRunSubTest(subdir, loggers, arguments); +#endif // !QT_NO_PROCESS } // attribute must contain =" -- cgit v1.2.3