whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Caroline Chao 2012-10-18 15:19:11 +02:00 committed by The Qt Project
parent dbb2581af5
commit 33aea0cc1c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -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()
{