diff options
| author | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-02-13 13:01:57 +0200 |
|---|---|---|
| committer | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-03-16 09:34:15 +0000 |
| commit | bc69fd1dfe30876909091d93a07640a498a24c0c (patch) | |
| tree | 6af7b94832fcd5c596e54338266d43772ca152e6 /tests/auto/corelib/tools | |
| parent | f1b3244ac16cd5b306450c53fcbd4ee673bfe53b (diff) | |
Skip instead of entirely excluding tests with disabled features
Properly QSKIP tests that use disabled QProcess and symlink
features instead of excluding them silently by #ifdef.
Other reason is that moc doesn't respect QT_NO_* defines
in class definition which causes build issues on some
platforms.
Change-Id: I041020f7452f7d36c7ec8a5866a4ba5eb23d1f94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 1c96aaba98..5b9c9e0b36 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -134,7 +134,7 @@ private slots: #endif void ctor(); -#if !defined(Q_OS_WINCE) && !defined(QT_NO_PROCESS) +#if !defined(Q_OS_WINCE) void emptyCtor(); #endif void legacyNames(); @@ -499,9 +499,14 @@ static inline bool runSysAppTest(const QString &binary, } return true; } +#endif +#if !defined(Q_OS_WINCE) void tst_QLocale::emptyCtor() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else #define TEST_CTOR(req_lc, exp_str) \ { \ /* Test constructor without arguments. Needs separate process */ \ @@ -570,6 +575,7 @@ void tst_QLocale::emptyCtor() #endif // Q_OS_BLACKBERRY #undef TEST_CTOR +#endif } #endif |