test: Moving tst_QProcess::echoTest_performance()
tst_QProcess::echoTest_performance() is not an unit test but a performance test, so moving it from 'tests/auto/corelib/io/qprocess' to 'tests/benchmarks/corelib/io/qprocess' Change-Id: I796788534eafc5ca3b8d86c0ec46998285fd4b8f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
7b8e10ddd0
commit
221bd941ff
1
tests/auto/corelib/io/qprocess/.gitignore
vendored
1
tests/auto/corelib/io/qprocess/.gitignore
vendored
@ -11,7 +11,6 @@ testProcessEcho/testProcessEcho
|
|||||||
testProcessEcho2/testProcessEcho2
|
testProcessEcho2/testProcessEcho2
|
||||||
testProcessEcho3/testProcessEcho3
|
testProcessEcho3/testProcessEcho3
|
||||||
testProcessEnvironment/testProcessEnvironment
|
testProcessEnvironment/testProcessEnvironment
|
||||||
testProcessLoopback/testProcessLoopback
|
|
||||||
testProcessNormal/testProcessNormal
|
testProcessNormal/testProcessNormal
|
||||||
testProcessOutput/testProcessOutput
|
testProcessOutput/testProcessOutput
|
||||||
testProcessSpacesArgs/nospace
|
testProcessSpacesArgs/nospace
|
||||||
|
@ -4,7 +4,6 @@ SUBPROGRAMS = \
|
|||||||
testProcessEcho2 \
|
testProcessEcho2 \
|
||||||
testProcessEcho3 \
|
testProcessEcho3 \
|
||||||
testProcessEnvironment \
|
testProcessEnvironment \
|
||||||
testProcessLoopback \
|
|
||||||
testProcessNormal \
|
testProcessNormal \
|
||||||
testProcessOutput \
|
testProcessOutput \
|
||||||
testProcessDeadWhileReading \
|
testProcessDeadWhileReading \
|
||||||
|
@ -87,7 +87,6 @@ private slots:
|
|||||||
void echoTest_data();
|
void echoTest_data();
|
||||||
void echoTest();
|
void echoTest();
|
||||||
void echoTest2();
|
void echoTest2();
|
||||||
void echoTest_performance();
|
|
||||||
#if defined Q_OS_WIN
|
#if defined Q_OS_WIN
|
||||||
void echoTestGui();
|
void echoTestGui();
|
||||||
void batFiles_data();
|
void batFiles_data();
|
||||||
@ -493,56 +492,6 @@ void tst_QProcess::echoTest2()
|
|||||||
process = 0;
|
process = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
void tst_QProcess::echoTest_performance()
|
|
||||||
{
|
|
||||||
#ifdef Q_OS_WINCE
|
|
||||||
QSKIP("Reading and writing to a process is not supported on Qt/CE");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QProcess process;
|
|
||||||
process.start("testProcessLoopback/testProcessLoopback");
|
|
||||||
|
|
||||||
QByteArray array;
|
|
||||||
array.resize(1024 * 1024);
|
|
||||||
for (int j = 0; j < array.size(); ++j)
|
|
||||||
array[j] = 'a' + (j % 20);
|
|
||||||
|
|
||||||
QVERIFY(process.waitForStarted());
|
|
||||||
|
|
||||||
QTime stopWatch;
|
|
||||||
stopWatch.start();
|
|
||||||
|
|
||||||
qint64 totalBytes = 0;
|
|
||||||
QByteArray dump;
|
|
||||||
QSignalSpy readyReadSpy(&process, SIGNAL(readyRead()));
|
|
||||||
QVERIFY(readyReadSpy.isValid());
|
|
||||||
while (stopWatch.elapsed() < 2000) {
|
|
||||||
process.write(array);
|
|
||||||
while (process.bytesToWrite() > 0) {
|
|
||||||
int readCount = readyReadSpy.count();
|
|
||||||
QVERIFY(process.waitForBytesWritten(5000));
|
|
||||||
if (readyReadSpy.count() == readCount)
|
|
||||||
QVERIFY(process.waitForReadyRead(5000));
|
|
||||||
}
|
|
||||||
|
|
||||||
while (process.bytesAvailable() < array.size())
|
|
||||||
QVERIFY2(process.waitForReadyRead(5000), qPrintable(process.errorString()));
|
|
||||||
dump = process.readAll();
|
|
||||||
totalBytes += dump.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
qDebug() << "Elapsed time:" << stopWatch.elapsed() << "ms;"
|
|
||||||
<< "transfer rate:" << totalBytes / (1048.576) / stopWatch.elapsed()
|
|
||||||
<< "MB/s";
|
|
||||||
|
|
||||||
for (int j = 0; j < array.size(); ++j)
|
|
||||||
QCOMPARE(char(dump.at(j)), char('a' + (j % 20)));
|
|
||||||
|
|
||||||
process.closeWriteChannel();
|
|
||||||
QVERIFY(process.waitForFinished());
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined Q_OS_WIN
|
#if defined Q_OS_WIN
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void tst_QProcess::echoTestGui()
|
void tst_QProcess::echoTestGui()
|
||||||
|
@ -5,5 +5,6 @@ SUBDIRS = \
|
|||||||
qfile \
|
qfile \
|
||||||
#qfileinfo \ # FIXME: broken
|
#qfileinfo \ # FIXME: broken
|
||||||
qiodevice \
|
qiodevice \
|
||||||
|
qprocess \
|
||||||
qtemporaryfile
|
qtemporaryfile
|
||||||
|
|
||||||
|
2
tests/benchmarks/corelib/io/qprocess/.gitignore
vendored
Normal file
2
tests/benchmarks/corelib/io/qprocess/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
tst_bench_qprocess
|
||||||
|
testProcessLoopback/testProcessLoopback
|
3
tests/benchmarks/corelib/io/qprocess/qprocess.pro
Normal file
3
tests/benchmarks/corelib/io/qprocess/qprocess.pro
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
TEMPLATE = subdirs
|
||||||
|
CONFIG += ordered
|
||||||
|
SUBDIRS = testProcessLoopback test
|
5
tests/benchmarks/corelib/io/qprocess/test/test.pro
Normal file
5
tests/benchmarks/corelib/io/qprocess/test/test.pro
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
TARGET = ../tst_bench_qprocess
|
||||||
|
SOURCES += ../tst_bench_qprocess.cpp
|
||||||
|
|
||||||
|
QT = core core-private testlib
|
||||||
|
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
109
tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp
Normal file
109
tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||||
|
** Contact: http://www.qt-project.org/legal
|
||||||
|
**
|
||||||
|
** This file is part of the test suite of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Digia. For licensing terms and
|
||||||
|
** conditions see http://qt.digia.com/licensing. For further information
|
||||||
|
** use the contact form at http://qt.digia.com/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 as published by the Free Software
|
||||||
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||||
|
** packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||||
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Digia gives you certain additional
|
||||||
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
** General Public License version 3.0 as published by the Free Software
|
||||||
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
|
** packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU General Public License version 3.0 requirements will be
|
||||||
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
#include <QtCore/QProcess>
|
||||||
|
|
||||||
|
class tst_QProcess : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
#ifndef QT_NO_PROCESS
|
||||||
|
private slots:
|
||||||
|
|
||||||
|
void echoTest_performance();
|
||||||
|
|
||||||
|
#endif // QT_NO_PROCESS
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef QT_NO_PROCESS
|
||||||
|
#ifndef Q_OS_WINCE
|
||||||
|
// Reading and writing to a process is not supported on Qt/CE
|
||||||
|
void tst_QProcess::echoTest_performance()
|
||||||
|
{
|
||||||
|
QProcess process;
|
||||||
|
process.start("testProcessLoopback/testProcessLoopback");
|
||||||
|
|
||||||
|
QByteArray array;
|
||||||
|
array.resize(1024 * 1024);
|
||||||
|
for (int j = 0; j < array.size(); ++j)
|
||||||
|
array[j] = 'a' + (j % 20);
|
||||||
|
|
||||||
|
QVERIFY(process.waitForStarted());
|
||||||
|
|
||||||
|
QTime stopWatch;
|
||||||
|
stopWatch.start();
|
||||||
|
|
||||||
|
qint64 totalBytes = 0;
|
||||||
|
QByteArray dump;
|
||||||
|
QSignalSpy readyReadSpy(&process, SIGNAL(readyRead()));
|
||||||
|
QVERIFY(readyReadSpy.isValid());
|
||||||
|
while (stopWatch.elapsed() < 2000) {
|
||||||
|
process.write(array);
|
||||||
|
while (process.bytesToWrite() > 0) {
|
||||||
|
int readCount = readyReadSpy.count();
|
||||||
|
QVERIFY(process.waitForBytesWritten(5000));
|
||||||
|
if (readyReadSpy.count() == readCount)
|
||||||
|
QVERIFY(process.waitForReadyRead(5000));
|
||||||
|
}
|
||||||
|
|
||||||
|
while (process.bytesAvailable() < array.size())
|
||||||
|
QVERIFY2(process.waitForReadyRead(5000), qPrintable(process.errorString()));
|
||||||
|
dump = process.readAll();
|
||||||
|
totalBytes += dump.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
qDebug() << "Elapsed time:" << stopWatch.elapsed() << "ms;"
|
||||||
|
<< "transfer rate:" << totalBytes / (1048.576) / stopWatch.elapsed()
|
||||||
|
<< "MB/s";
|
||||||
|
|
||||||
|
for (int j = 0; j < array.size(); ++j)
|
||||||
|
QCOMPARE(char(dump.at(j)), char('a' + (j % 20)));
|
||||||
|
|
||||||
|
process.closeWriteChannel();
|
||||||
|
QVERIFY(process.waitForFinished());
|
||||||
|
}
|
||||||
|
#endif // Q_OS_WINCE
|
||||||
|
|
||||||
|
#endif // QT_NO_PROCESS
|
||||||
|
|
||||||
|
QTEST_MAIN(tst_QProcess)
|
||||||
|
#include "tst_bench_qprocess.moc"
|
Loading…
x
Reference in New Issue
Block a user