diff options
Diffstat (limited to 'tests/auto/testlib')
6 files changed, 1 insertions, 111 deletions
diff --git a/tests/auto/testlib/selftests/.gitignore b/tests/auto/testlib/selftests/.gitignore index 56ba17abd7..98a3f49081 100644 --- a/tests/auto/testlib/selftests/.gitignore +++ b/tests/auto/testlib/selftests/.gitignore @@ -13,7 +13,6 @@ fetchbogus/tst_fetchbogus globaldata/tst_globaldata maxwarnings/tst_maxwarnings multiexec/tst_multiexec -qexecstringlist/tst_qexecstringlist singleskip/tst_singleskip skip/tst_skip skipglobal/tst_skipglobal diff --git a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro deleted file mode 100644 index de8a7da37e..0000000000 --- a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += tst_qexecstringlist.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - - -TARGET = qexecstringlist diff --git a/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp b/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp deleted file mode 100644 index aacfab76f1..0000000000 --- a/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp +++ /dev/null @@ -1,96 +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 <QtCore> -#include <QtTest/QtTest> - -class tst_QExecStringList: public QObject -{ - Q_OBJECT - -private slots: - void testA() const; - void testB() const; - void testB_data() const; - void testC() const; -}; - -void tst_QExecStringList::testA() const -{ -} - -void tst_QExecStringList::testB() const -{ - QFETCH(bool, dummy); - Q_UNUSED(dummy); -} - -void tst_QExecStringList::testB_data() const -{ - QTest::addColumn<bool>("dummy"); - - QTest::newRow("Data1") << false; - QTest::newRow("Data2") << false; - QTest::newRow("Data3") << false; -} - -void tst_QExecStringList::testC() const -{ -} - -int main(int argc,char *argv[]) -{ - QCoreApplication app(argc, argv); - - tst_QExecStringList test; - - QTest::qExec(&test, app.arguments()); - QTest::qExec(&test, QStringList("appName")); - QTest::qExec(&test, QStringList("appName") << "testA"); - QTest::qExec(&test, QStringList("appName") << "testB"); - QTest::qExec(&test, QStringList("appName") << "testB:Data2"); - QTest::qExec(&test, QStringList("appName") << "testC"); - - return 0; -} - -#include "tst_qexecstringlist.moc" diff --git a/tests/auto/testlib/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro index 68239754aa..b4c4255dfc 100644 --- a/tests/auto/testlib/selftests/selftests.pro +++ b/tests/auto/testlib/selftests/selftests.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skip \ strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \ skipinit skipinitdata datetime singleskip assert differentexec \ - exceptionthrow qexecstringlist datatable commandlinedata\ + exceptionthrow datatable commandlinedata \ benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \ benchliboptions xunit badxml longstring float printdatatags \ printdatatagswithglobaltags findtestdata diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc index fb303af2b5..5090fa7378 100644 --- a/tests/auto/testlib/selftests/selftests.qrc +++ b/tests/auto/testlib/selftests/selftests.qrc @@ -95,7 +95,6 @@ <file>expected_multiexec.xunitxml</file> <file>expected_printdatatags.txt</file> <file>expected_printdatatagswithglobaltags.txt</file> - <file>expected_qexecstringlist.txt</file> <file>expected_singleskip.lightxml</file> <file>expected_singleskip.txt</file> <file>expected_singleskip.xml</file> diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index b98a02aa4e..43081415c7 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -327,7 +327,6 @@ void tst_Selftests::runSubTest_data() << "multiexec" << "printdatatags" << "printdatatagswithglobaltags" - << "qexecstringlist" << "singleskip" << "skip" << "skipinit" @@ -392,9 +391,6 @@ void tst_Selftests::runSubTest_data() if (subtest == "multiexec") { continue; } - if (subtest == "qexecstringlist") { - continue; - } if (subtest == "benchliboptions") { continue; } |