summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-07-20 05:19:57 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-07-20 05:47:25 (GMT)
commit8669542cfb31030acd9280a3d1817a0d3c1efbbc (patch)
tree99b403ec833b4cda44485f17dc3587533612691b /src/testlib
parent568e4ab97645692250d2aa25670aebfc0915afc0 (diff)
downloadQt-8669542cfb31030acd9280a3d1817a0d3c1efbbc.zip
Qt-8669542cfb31030acd9280a3d1817a0d3c1efbbc.tar.gz
Qt-8669542cfb31030acd9280a3d1817a0d3c1efbbc.tar.bz2
Revert "Add the chart utility from qtestlib-tools."
This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestcase.cpp30
1 files changed, 1 insertions, 29 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 6591481..1aa2642 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -54,7 +54,6 @@
#include <QtCore/qdir.h>
#include <QtCore/qprocess.h>
#include <QtCore/qdebug.h>
-#include <QtCore/qlibraryinfo.h>
#include "QtTest/private/qtestlog_p.h"
#include "QtTest/private/qtesttable_p.h"
@@ -989,9 +988,6 @@ static void qParseArgs(int argc, char *argv[])
" -iterations n : Sets the number of accumulation iterations.\n"
" -median n : Sets the number of median iterations.\n"
" -vb : Print out verbose benchmarking information.\n"
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
- " -chart : Create chart based on the benchmark result.\n"
-#endif
"\n"
" -help : This help\n";
@@ -1105,12 +1101,8 @@ static void qParseArgs(int argc, char *argv[])
} else if (strcmp(argv[i], "-vb") == 0) {
QBenchmarkGlobalData::current->verboseOutput = true;
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
} else if (strcmp(argv[i], "-chart") == 0) {
- QBenchmarkGlobalData::current->createChart = true;
- QTestLog::setLogMode(QTestLog::XML);
- QTestLog::redirectOutput("results.xml");
-#endif
+ fprintf(stderr, "Warning: `-chart' option is not available\n");
} else if (strcmp(argv[i], "-qws") == 0) {
// do nothing
} else if (strcmp(argv[i], "-graphicssystem") == 0) {
@@ -1713,26 +1705,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
}
#endif
-
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
- if (QBenchmarkGlobalData::current->createChart) {
- QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-#ifdef Q_OS_WIN
- chartLocation += QLatin1String("/../tools/qtestlib/chart/release/chart.exe");
-#else
- chartLocation += QLatin1String("/../tools/qtestlib/chart/chart");
-#endif
- if (QFile::exists(chartLocation)) {
- QProcess p;
- p.setProcessChannelMode(QProcess::ForwardedChannels);
- p.start(chartLocation, QStringList() << QLatin1String("results.xml"));
- p.waitForFinished(-1);
- } else {
- qDebug() << QLatin1String("Could not find the chart tool in ") + chartLocation + QLatin1String(", please make sure it is compiled.");
- }
- }
-#endif
-
#if defined(QTEST_NOEXITCODE)
return 0;
#else