Remove waitwithoutgui testlib selftest
This test is not useful for finding bugs in qtestlib's logging code, because it bypasses the qtestlib loggers and doesn't play nice with tst_selftest. Neither is this test very useful for finding bugs in QTest::qWait(), as the test only proves the qWait() terminates, not that it waits accurately, or even that it waits at all. Change-Id: Ia5dd7cbaf3a6fbb4e94e54ed155263580e495694 Reviewed-on: http://codereview.qt-project.org/5173 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
9e05e44bb4
commit
d60007744b
@ -1,2 +0,0 @@
|
||||
We just output something such that there's a baseline to compare against.
|
||||
Finished waiting!
|
@ -2,7 +2,7 @@ TEMPLATE = subdirs
|
||||
|
||||
SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skipglobal skip \
|
||||
strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \
|
||||
skipinit skipinitdata datetime singleskip assert waitwithoutgui differentexec \
|
||||
skipinit skipinitdata datetime singleskip assert differentexec \
|
||||
exceptionthrow qexecstringlist datatable commandlinedata\
|
||||
benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \
|
||||
benchliboptions xunit badxml longstring
|
||||
|
@ -122,10 +122,6 @@
|
||||
<file>expected_subtest.txt</file>
|
||||
<file>expected_subtest.xml</file>
|
||||
<file>expected_subtest.xunitxml</file>
|
||||
<file>expected_waitwithoutgui.lightxml</file>
|
||||
<file>expected_waitwithoutgui.txt</file>
|
||||
<file>expected_waitwithoutgui.xml</file>
|
||||
<file>expected_waitwithoutgui.xunitxml</file>
|
||||
<file>expected_warnings.lightxml</file>
|
||||
<file>expected_warnings.txt</file>
|
||||
<file>expected_warnings.xml</file>
|
||||
|
@ -210,7 +210,6 @@ void tst_Selftests::runSubTest_data()
|
||||
<< "assert"
|
||||
#endif
|
||||
|
||||
<< "waitwithoutgui"
|
||||
<< "differentexec"
|
||||
#ifndef QT_NO_EXCEPTIONS
|
||||
// The machine that run the intel autotests will popup a dialog
|
||||
@ -282,9 +281,6 @@ void tst_Selftests::runSubTest_data()
|
||||
if (subtest == "benchliboptions") {
|
||||
continue;
|
||||
}
|
||||
if (subtest == "waitwithoutgui") {
|
||||
continue;
|
||||
}
|
||||
// `crashes' will not output valid XML on platforms without a crash handler
|
||||
if (subtest == "crashes") {
|
||||
continue;
|
||||
|
@ -1,62 +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 <QtTest/QtTest>
|
||||
#include <QTextStream>
|
||||
#include <QCoreApplication>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
QTextStream out(stdout);
|
||||
|
||||
out << "We just output something such that there's a baseline to compare against." << endl;
|
||||
|
||||
/* Simply call qWait(). */
|
||||
QTest::qWait(100);
|
||||
|
||||
out << "Finished waiting!" << endl;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,13 +0,0 @@
|
||||
load(qttest_p4)
|
||||
|
||||
# this is not a real testcase ('make check' should not run it)
|
||||
CONFIG -= testcase
|
||||
|
||||
QT -= gui
|
||||
SOURCES += tst_waitwithoutgui.cpp
|
||||
|
||||
mac:CONFIG -= app_bundle
|
||||
CONFIG -= debug_and_release_target
|
||||
|
||||
|
||||
TARGET = waitwithoutgui
|
Loading…
Reference in New Issue
Block a user