Test: remove QSKIP from tst_qstextstream
Instead omit the whole tests when Q_OS_WINCE is defined. Change-Id: Idb15d622c9e1dbe4c8ec6a43c34a88e7fef2a384 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>bb10
parent
26dddabcaa
commit
d81cf44a6b
|
|
@ -195,9 +195,11 @@ private slots:
|
|||
void pos();
|
||||
void pos2();
|
||||
void pos3LargeFile();
|
||||
#ifndef Q_OS_WINCE
|
||||
void readStdin();
|
||||
void readAllFromStdin();
|
||||
void readLineFromStdin();
|
||||
#endif
|
||||
void read();
|
||||
void qbool();
|
||||
void forcePoint();
|
||||
|
|
@ -1385,11 +1387,10 @@ void tst_QTextStream::pos3LargeFile()
|
|||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
#ifndef Q_OS_WINCE
|
||||
// Qt/CE has no stdin/out support for processes
|
||||
void tst_QTextStream::readStdin()
|
||||
{
|
||||
#if defined(Q_OS_WINCE)
|
||||
QSKIP("Qt/CE has no stdin/out support for processes");
|
||||
#endif
|
||||
QProcess stdinProcess;
|
||||
stdinProcess.start("stdinProcess/stdinProcess");
|
||||
stdinProcess.setReadChannel(QProcess::StandardError);
|
||||
|
|
@ -1409,13 +1410,13 @@ void tst_QTextStream::readStdin()
|
|||
QCOMPARE(b, 2);
|
||||
QCOMPARE(c, 3);
|
||||
}
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
#ifndef Q_OS_WINCE
|
||||
// Qt/CE has no stdin/out support for processes
|
||||
void tst_QTextStream::readAllFromStdin()
|
||||
{
|
||||
#if defined(Q_OS_WINCE)
|
||||
QSKIP("Qt/CE has no stdin/out support for processes");
|
||||
#endif
|
||||
QProcess stdinProcess;
|
||||
stdinProcess.start("readAllStdinProcess/readAllStdinProcess", QIODevice::ReadWrite | QIODevice::Text);
|
||||
stdinProcess.setReadChannel(QProcess::StandardError);
|
||||
|
|
@ -1430,13 +1431,13 @@ void tst_QTextStream::readAllFromStdin()
|
|||
QChar quoteChar('"');
|
||||
QCOMPARE(stream.readAll(), QString::fromLatin1("%1hello world%2 \n").arg(quoteChar).arg(quoteChar));
|
||||
}
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
#ifndef Q_OS_WINCE
|
||||
// Qt/CE has no stdin/out support for processes
|
||||
void tst_QTextStream::readLineFromStdin()
|
||||
{
|
||||
#if defined(Q_OS_WINCE)
|
||||
QSKIP("Qt/CE has no stdin/out support for processes");
|
||||
#endif
|
||||
QProcess stdinProcess;
|
||||
stdinProcess.start("readLineStdinProcess/readLineStdinProcess", QIODevice::ReadWrite | QIODevice::Text);
|
||||
stdinProcess.setReadChannel(QProcess::StandardError);
|
||||
|
|
@ -1453,6 +1454,7 @@ void tst_QTextStream::readLineFromStdin()
|
|||
|
||||
QVERIFY(stdinProcess.waitForFinished(5000));
|
||||
}
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
void tst_QTextStream::read()
|
||||
|
|
|
|||
Loading…
Reference in New Issue