diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2012-10-18 15:19:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 09:41:36 +0200 |
| commit | 33aea0cc1c19962b72e78659b790be8b87e2c083 (patch) | |
| tree | a5588cc6085677dd9c04043d60754efa8b9af8d6 /tests | |
| parent | dbb2581af5cd1e891cb4202ff8a8caa68cd74b6a (diff) | |
Test: remove QSKIP in tst_QLocale::emptyCtor
Instead omit the whole test when appropriate.
Change-Id: Iebd569676cc7b2f8fe4a1d272107e092410d397b
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index af9f03c551..a8aded5646 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -95,7 +95,9 @@ private slots: #endif void ctor(); +#if !defined(Q_OS_WINCE) && !defined(QT_NO_PROCESS) void emptyCtor(); +#endif void unixLocaleName(); void double_conversion_data(); void double_conversion(); @@ -374,6 +376,10 @@ void tst_QLocale::ctor() #undef TEST_CTOR } +#if !defined(Q_OS_WINCE) && !defined(QT_NO_PROCESS) +// Not when Q_OS_WINCE is defined because the test uses unsupported +// Windows CE QProcess functionality (std streams, env) +// Also Qt needs to be compiled without QT_NO_PROCESS static inline bool runSysApp(const QString &binary, const QStringList &env, QString *output, @@ -424,12 +430,6 @@ static inline bool runSysAppTest(const QString &binary, void tst_QLocale::emptyCtor() { -#if defined(Q_OS_WINCE) - QSKIP("Uses unsupported Windows CE QProcess functionality (std streams, env)"); -#endif -#if defined(QT_NO_PROCESS) - QSKIP("Qt was compiled with QT_NO_PROCESS"); -#else #define TEST_CTOR(req_lc, exp_str) \ { \ /* Test constructor without arguments. Needs separate process */ \ @@ -492,8 +492,8 @@ void tst_QLocale::emptyCtor() TEST_CTOR("123456", defaultLoc.toLatin1()); #undef TEST_CTOR -#endif } +#endif void tst_QLocale::unixLocaleName() { |