diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-07-21 11:19:49 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-07-21 11:20:03 (GMT) |
| commit | 31e358f2290c145b839fc5b7b277922c1ab6e19b (patch) | |
| tree | 6569829854abd6c2011f740c3d91f6fe9e890836 /tests/auto/qtextcodec/tst_qtextcodec.cpp | |
| parent | 2db22b1b12cc7579d08a83ad889efe7f8f07c843 (diff) | |
| download | Qt-31e358f2290c145b839fc5b7b277922c1ab6e19b.zip Qt-31e358f2290c145b839fc5b7b277922c1ab6e19b.tar.gz Qt-31e358f2290c145b839fc5b7b277922c1ab6e19b.tar.bz2 | |
fix tests for QT_NO_PROCESS and when running tests as root
Diffstat (limited to 'tests/auto/qtextcodec/tst_qtextcodec.cpp')
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index f2da1ec..9f51805 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1875,6 +1875,9 @@ void tst_QTextCodec::codecForUtfText() #ifdef Q_OS_UNIX void tst_QTextCodec::toLocal8Bit() { +#ifdef QT_NO_PROCESS + QSKIP("This test requires QProcess", SkipAll); +#else QProcess process; process.start("echo/echo"); QString string(QChar(0x410)); @@ -1884,6 +1887,7 @@ void tst_QTextCodec::toLocal8Bit() process.waitForFinished(); QCOMPARE(process.exitStatus(), QProcess::NormalExit); QCOMPARE(process.exitCode(), 0); +#endif } #endif |