summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/codecs')
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
index d1e6a95d8c..095103dd8a 100644
--- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
@@ -91,7 +91,7 @@ private slots:
void codecForUtfText_data();
void codecForUtfText();
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
void toLocal8Bit();
#endif
@@ -1934,12 +1934,9 @@ void tst_QTextCodec::codecForUtfText()
QVERIFY(codec == 0);
}
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
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));
@@ -1949,7 +1946,6 @@ void tst_QTextCodec::toLocal8Bit()
process.waitForFinished();
QCOMPARE(process.exitStatus(), QProcess::NormalExit);
QCOMPARE(process.exitCode(), 0);
-#endif
}
#endif