From af5f17e2147b98b1978d68dbca25a1117a14563b Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 18 Oct 2011 13:48:54 +1000 Subject: Remove skipglobal testlib selftest. This test duplicates the skipinitdata selftest and has slightly less informative output. Change-Id: Ifd40e3ef8030059ec8fa0089ce5b2a994624abeb Reviewed-by: Rohan McGovern --- .../testlib/selftests/expected_skipglobal.lightxml | 9 -- .../auto/testlib/selftests/expected_skipglobal.txt | 6 -- .../auto/testlib/selftests/expected_skipglobal.xml | 12 --- .../testlib/selftests/expected_skipglobal.xunitxml | 13 --- tests/auto/testlib/selftests/selftests.pro | 2 +- tests/auto/testlib/selftests/selftests.qrc | 4 - .../testlib/selftests/skipglobal/skipglobal.pro | 13 --- .../selftests/skipglobal/tst_skipglobal.cpp | 113 --------------------- tests/auto/testlib/selftests/tst_selftests.cpp | 1 - 9 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 tests/auto/testlib/selftests/expected_skipglobal.lightxml delete mode 100644 tests/auto/testlib/selftests/expected_skipglobal.txt delete mode 100644 tests/auto/testlib/selftests/expected_skipglobal.xml delete mode 100644 tests/auto/testlib/selftests/expected_skipglobal.xunitxml delete mode 100644 tests/auto/testlib/selftests/skipglobal/skipglobal.pro delete mode 100644 tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp diff --git a/tests/auto/testlib/selftests/expected_skipglobal.lightxml b/tests/auto/testlib/selftests/expected_skipglobal.lightxml deleted file mode 100644 index 66084fc1e8..0000000000 --- a/tests/auto/testlib/selftests/expected_skipglobal.lightxml +++ /dev/null @@ -1,9 +0,0 @@ - - @INSERT_QT_VERSION_HERE@ - @INSERT_QT_VERSION_HERE@ - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skipglobal.txt b/tests/auto/testlib/selftests/expected_skipglobal.txt deleted file mode 100644 index 22f66e4307..0000000000 --- a/tests/auto/testlib/selftests/expected_skipglobal.txt +++ /dev/null @@ -1,6 +0,0 @@ -********* Start testing of tst_SkipGlobal ********* -Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ -SKIP : tst_SkipGlobal::initTestCase() Skippy Skippy - Loc: [/home/fenglich/dev/qt-4.3/tests/auto/selftests/skipglobal/tst_skipglobal.cpp(39)] -Totals: 0 passed, 0 failed, 1 skipped -********* Finished testing of tst_SkipGlobal ********* diff --git a/tests/auto/testlib/selftests/expected_skipglobal.xml b/tests/auto/testlib/selftests/expected_skipglobal.xml deleted file mode 100644 index 4d25bc9460..0000000000 --- a/tests/auto/testlib/selftests/expected_skipglobal.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - @INSERT_QT_VERSION_HERE@ - @INSERT_QT_VERSION_HERE@ - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skipglobal.xunitxml b/tests/auto/testlib/selftests/expected_skipglobal.xunitxml deleted file mode 100644 index cc43ec8614..0000000000 --- a/tests/auto/testlib/selftests/expected_skipglobal.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro index 353e465961..a43ecdf789 100644 --- a/tests/auto/testlib/selftests/selftests.pro +++ b/tests/auto/testlib/selftests/selftests.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skipglobal skip \ +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\ diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc index 41fa7e0763..10c16ccbf1 100644 --- a/tests/auto/testlib/selftests/selftests.qrc +++ b/tests/auto/testlib/selftests/selftests.qrc @@ -102,10 +102,6 @@ expected_skip.txt expected_skip.xml expected_skip.xunitxml - expected_skipglobal.lightxml - expected_skipglobal.txt - expected_skipglobal.xml - expected_skipglobal.xunitxml expected_skipinit.lightxml expected_skipinit.txt expected_skipinit.xml diff --git a/tests/auto/testlib/selftests/skipglobal/skipglobal.pro b/tests/auto/testlib/selftests/skipglobal/skipglobal.pro deleted file mode 100644 index fb8d40cbd9..0000000000 --- a/tests/auto/testlib/selftests/skipglobal/skipglobal.pro +++ /dev/null @@ -1,13 +0,0 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - -SOURCES += tst_skipglobal.cpp -QT = core - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - - -TARGET = skipglobal diff --git a/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp b/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp deleted file mode 100644 index aec32ed0c0..0000000000 --- a/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp +++ /dev/null @@ -1,113 +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 - -class tst_SkipGlobal: public QObject -{ - Q_OBJECT -public slots: - void init(); - void initTestCase(); - void initTestCase_data(); - - void cleanup(); - void cleanupTestCase(); - -private slots: - void testGlobal_data(); - void testGlobal(); -}; - - -void tst_SkipGlobal::initTestCase() -{ - printf("initTestCase %s %s\n", - QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)", - QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); -} - -void tst_SkipGlobal::initTestCase_data() -{ - QSKIP("Skippy Skippy", SkipAll); -} - -void tst_SkipGlobal::cleanupTestCase() -{ - printf("cleanupTestCase %s %s\n", - QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)", - QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); -} - -void tst_SkipGlobal::init() -{ - printf("init %s %s\n", - QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)", - QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); -} - -void tst_SkipGlobal::cleanup() -{ - printf("cleanup %s %s\n", - QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)", - QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); -} - -void tst_SkipGlobal::testGlobal_data() -{ - QTest::addColumn("booll"); - QTest::newRow("local 1") << false; - QTest::newRow("local 2") << true; -} - -void tst_SkipGlobal::testGlobal() -{ - QFETCH_GLOBAL(bool, booli); - printf("global: %d\n", booli); - QFETCH(bool, booll); - printf("local: %d\n", booll); -} - -QTEST_MAIN(tst_SkipGlobal) - -#include "tst_skipglobal.moc" diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index bf1de193d2..bbdc5ee9e9 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -335,7 +335,6 @@ void tst_Selftests::runSubTest_data() << "qexecstringlist" << "singleskip" << "skip" - << "skipglobal" << "skipinit" << "skipinitdata" << "sleep" -- cgit v1.2.3