From bf3c84f718454f84b2ffbfa7fd1c7998bb5b01c2 Mon Sep 17 00:00:00 2001 From: aavit Date: Wed, 29 Jun 2011 13:24:37 +0200 Subject: Cleaning up the QPainter/arthur testing stuff This removes various remains of historical test tools, and the entire tests/arthur directory. The living parts are now: tests/auto/lancelot - including the suite of qps scripts. The script engine now lives here. tests/baselineserver - moved to toplevel since not arthur-specific. tests/manual/lance - for manual running and editing of qps scripts. Change-Id: I7c7f5df9197f4984a918dd1f9b31f42ee80d6152 Reviewed-on: http://codereview.qt.nokia.com/895 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta --- tests/arthur/performancediff/main.cpp | 54 ------ tests/arthur/performancediff/performancediff.cpp | 219 ----------------------- tests/arthur/performancediff/performancediff.h | 73 -------- tests/arthur/performancediff/performancediff.pro | 19 -- 4 files changed, 365 deletions(-) delete mode 100644 tests/arthur/performancediff/main.cpp delete mode 100644 tests/arthur/performancediff/performancediff.cpp delete mode 100644 tests/arthur/performancediff/performancediff.h delete mode 100644 tests/arthur/performancediff/performancediff.pro (limited to 'tests/arthur/performancediff') diff --git a/tests/arthur/performancediff/main.cpp b/tests/arthur/performancediff/main.cpp deleted file mode 100644 index d16596703b..0000000000 --- a/tests/arthur/performancediff/main.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include - -#include "performancediff.h" - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - PerformanceDiff generator; - - generator.run(argc, argv); - - return 0; -} diff --git a/tests/arthur/performancediff/performancediff.cpp b/tests/arthur/performancediff/performancediff.cpp deleted file mode 100644 index 3580f2aefa..0000000000 --- a/tests/arthur/performancediff/performancediff.cpp +++ /dev/null @@ -1,219 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "performancediff.h" - -#include "xmldata.h" - -#include - -#include -#include -#include -#include - -#include -#include - - -static const int MIN_TEST_VAL = 20; -static const int TEST_EPSILON = 5; //ms - -static void usage(const char *progname) -{ - std::cerr << "Couldn't find 'framework.ini' " - << "file and no output has been specified."< &engines) -{ - QDir dir(dirName); - dir.setFilter(QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot); - QFileInfoList list = dir.entryInfoList(); - for (int i = 0; i < list.size(); ++i) { - QFileInfo fileInfo = list.at(i); - QString dataFile = QString("%1/data.xml") - .arg(fileInfo.absoluteFilePath()); - if (QFile::exists(dataFile)) { - XMLReader handler; - QXmlSimpleReader reader; - reader.setContentHandler(&handler); - reader.setErrorHandler(&handler); - - QFile file(dataFile); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - qWarning("Cannot open file '%s', because: %s", - qPrintable(dataFile), qPrintable(file.errorString())); - continue; - } - - QXmlInputSource xmlInputSource(&file); - if (reader.parse(xmlInputSource)) { - XMLEngine *engine = handler.xmlEngine(); - engines.insert(engine->name, engine); - } - } - } - -} -void PerformanceDiff::run(int argc, char **argv) -{ - processArguments(argc, argv); - - loadEngines(inputDirName, inputEngines); - loadEngines(diffDirName, diffEngines); - - if (inputEngines.isEmpty() || diffEngines.isEmpty()) { - usage(argv[0]); - return; - } - - generateDiff(); - //generateOutput(); -} - -void PerformanceDiff::processArguments(int argc, char **argv) -{ - if (argc != 3) - return; - inputDirName = QString(argv[1]); - diffDirName = QString(argv[2]); -} - -void PerformanceDiff::generateDiff() -{ - qreal totalIn = 0; - qreal totalDiff = 0; - - std::cout<name]; - if (!inEngine) - continue; - foreach(XMLSuite *diffSuite, diffEngine->suites) { - XMLSuite *inSuite = inEngine->suites[diffSuite->name]; - if (!inSuite) - continue; - - foreach(XMLFile *diffFile, diffSuite->files) { - XMLFile *inFile = inSuite->files[diffFile->name]; - if (!inFile) - continue; - - qreal inAvg = 0; - qreal diffAvg = 0; - qreal inMin = 0; - qreal inMax = 0; - foreach(XMLData data, inFile->data) { - inAvg = (double(data.timeToRender)/data.iterations); - if (!inMin) - inMin = data.minElapsed; - else if (data.minElapsed < inMin) - inMin = data.minElapsed; - if (!inMax) - inMax = data.maxElapsed; - else if (inMax < data.maxElapsed) - inMax = data.maxElapsed; - } - //skipping really small tests - if (inAvg < MIN_TEST_VAL) { - continue; - } - - totalIn += inAvg; - foreach(XMLData data, diffFile->data) { - diffAvg = (double(data.timeToRender)/data.iterations); - } - totalDiff += diffAvg; - - QFileInfo fi(diffFile->name); - std::cout.width(80); - std::cout.setf(std::ios::fixed, std::ios::floatfield); - std::cout.setf(std::ios::showpoint); - std::cout << std::resetiosflags(std::ios::right); - std::cout << std::resetiosflags(std::ios::left); - std::cout< TEST_EPSILON)) { - std::cout<<" + ("< inMax && - (qAbs(diffAvg - inMax) > TEST_EPSILON)) { - std::cout<<" - ("< -#include - -QT_FORWARD_DECLARE_CLASS(QStringList) -QT_FORWARD_DECLARE_CLASS(QSettings) - -class PerformanceDiff -{ -public: - PerformanceDiff(); - - //void generateOutput(); - - void run(int argc, char **argv); - -private: - void processArguments(int argc, char **argv); - void generateDiff(); -private: - QMap inputEngines; - QMap diffEngines; - - QSettings *settings; - QString inputDirName; - QString diffDirName; -}; - -#endif diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro deleted file mode 100644 index 8c1fb98047..0000000000 --- a/tests/arthur/performancediff/performancediff.pro +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile -*- -COMMON_FOLDER = $$PWD/../common -include(../arthurtester.pri) -TEMPLATE = app -TARGET = performancediff -DEPENDPATH += . -INCLUDEPATH += . -DESTDIR = ../bin - -CONFIG += console - -QT += xml svg core-private gui-private -contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl - -# Input -HEADERS += performancediff.h -SOURCES += main.cpp performancediff.cpp - - -- cgit v1.2.3