summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-10-16 23:08:35 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-19 02:43:05 +0200
commit221bd941ff255947ce7c78d08b1f9705e3d437be (patch)
treed56946ef23f4f366b63b93753d998c144ab61f75 /tests/auto
parent7b8e10ddd02693b3d6b7a7e74d2103787f6e76ac (diff)
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>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/io/qprocess/.gitignore1
-rw-r--r--tests/auto/corelib/io/qprocess/qprocess.pri1
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessLoopback/main.cpp57
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro5
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp51
5 files changed, 0 insertions, 115 deletions
diff --git a/tests/auto/corelib/io/qprocess/.gitignore b/tests/auto/corelib/io/qprocess/.gitignore
index a273810042..7dcb25dede 100644
--- a/tests/auto/corelib/io/qprocess/.gitignore
+++ b/tests/auto/corelib/io/qprocess/.gitignore
@@ -11,7 +11,6 @@ testProcessEcho/testProcessEcho
testProcessEcho2/testProcessEcho2
testProcessEcho3/testProcessEcho3
testProcessEnvironment/testProcessEnvironment
-testProcessLoopback/testProcessLoopback
testProcessNormal/testProcessNormal
testProcessOutput/testProcessOutput
testProcessSpacesArgs/nospace
diff --git a/tests/auto/corelib/io/qprocess/qprocess.pri b/tests/auto/corelib/io/qprocess/qprocess.pri
index 299432db77..d139b3dcef 100644
--- a/tests/auto/corelib/io/qprocess/qprocess.pri
+++ b/tests/auto/corelib/io/qprocess/qprocess.pri
@@ -4,7 +4,6 @@ SUBPROGRAMS = \
testProcessEcho2 \
testProcessEcho3 \
testProcessEnvironment \
- testProcessLoopback \
testProcessNormal \
testProcessOutput \
testProcessDeadWhileReading \
diff --git a/tests/auto/corelib/io/qprocess/testProcessLoopback/main.cpp b/tests/auto/corelib/io/qprocess/testProcessLoopback/main.cpp
deleted file mode 100644
index 2b27cbe900..0000000000
--- a/tests/auto/corelib/io/qprocess/testProcessLoopback/main.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** 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 <stdio.h>
-
-int main()
-{
- char buffer[1024];
- for (;;) {
- size_t num = fread(buffer, 1, sizeof(buffer), stdin);
- if (num <= 0)
- break;
- fwrite(buffer, num, 1, stdout);
- fflush(stdout);
- }
-
- return 0;
-}
diff --git a/tests/auto/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro b/tests/auto/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
deleted file mode 100644
index 3940ddbf98..0000000000
--- a/tests/auto/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
-DESTDIR = ./
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index a294dca506..9ec5eb489e 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -87,7 +87,6 @@ private slots:
void echoTest_data();
void echoTest();
void echoTest2();
- void echoTest_performance();
#if defined Q_OS_WIN
void echoTestGui();
void batFiles_data();
@@ -493,56 +492,6 @@ void tst_QProcess::echoTest2()
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
//-----------------------------------------------------------------------------
void tst_QProcess::echoTestGui()