AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build qitemview autotest on IRIX.

Browse Source 
The test was being skipped one test function at a time on IRIX.  It's
better to avoid building or running it, rather than spending time
running a test that does nothing on that platform.

This commit also turns a silent skip on other platforms into an explicit
QSKIP to make it more obvious that there's an unfixed TODO there.

Change-Id: I7cae4f0f2eaebf5977a781b2ce15d1e71ef13b36
Reviewed-on: http://codereview.qt-project.org/5957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-10-04 16:24:54 +10:00 committed by Qt by Nokia
parent 2aa9cb5957
commit 2ca3373376
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/gui.pro
View File

@ -135,6 +135,9 @@ SUBDIRS=\
qwswindowsystem \
qx11info \
# This test takes too long to run on IRIX, so skip it on that platform
irix-*:SUBDIRS -= qitemview
win32:SUBDIRS -= qtextpiecetable
!contains(QT_CONFIG, private_tests): SUBDIRS -= \

36
tests/auto/qitemview/tst_qitemview.cpp
View File

@ -244,10 +244,6 @@ public:
void tst_QItemView::init()
{
#ifdef Q_OS_IRIX
return;
#endif
testViews = new ViewsToTest();
populate();
}
@ -264,11 +260,6 @@ void tst_QItemView::cleanup()
void tst_QItemView::setupWithNoTestData()
{
#ifdef Q_OS_IRIX
//QSKIP("This test takes too long to execute on IRIX", SkipAll);
return;
#endif
ViewsToTest testViews;
QTest::addColumn<QString>("viewType");
QTest::addColumn<bool>("displays");
@ -329,10 +320,6 @@ void tst_QItemView::nonDestructiveBasicTest_data()
*/
void tst_QItemView::nonDestructiveBasicTest()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
#ifdef Q_OS_WINCE
QTest::qWait(400);
#endif
@ -493,9 +480,6 @@ void touch(QWidget *widget, Qt::KeyboardModifier modifier, Qt::Key keyPress){
*/
void tst_QItemView::spider()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
QFETCH(QString, viewType);
QFETCH(int, vscroll);
QFETCH(int, hscroll);
@ -527,12 +511,8 @@ void tst_QItemView::resize_data()
*/
void tst_QItemView::resize()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
return;
// This test needs to be re-thought out, it takes too long and
// doesn't really catch theproblem.
QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem.", SkipAll);
QFETCH(QString, viewType);
QFETCH(int, vscroll);
QFETCH(int, hscroll);
@ -560,9 +540,6 @@ void tst_QItemView::visualRect_data()
void tst_QItemView::visualRect()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
QFETCH(QString, viewType);
QFETCH(int, vscroll);
QFETCH(int, hscroll);
@ -696,9 +673,6 @@ void tst_QItemView::indexAt_data()
void tst_QItemView::indexAt()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
QFETCH(QString, viewType);
QFETCH(int, vscroll);
QFETCH(int, hscroll);
@ -732,9 +706,6 @@ void tst_QItemView::scrollTo_data()
void tst_QItemView::scrollTo()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
QFETCH(QString, viewType);
QFETCH(int, vscroll);
QFETCH(int, hscroll);
@ -783,9 +754,6 @@ public:
void tst_QItemView::moveCursor()
{
#ifdef Q_OS_IRIX
QSKIP("This test takes too long to execute on IRIX", SkipAll);
#endif
QFETCH(QString, viewType);
view = testViews->createView(viewType);
QVERIFY(view);