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

Remove the tests for Ubuntu Oneiric (11.10)

Browse Source 
This system is no longer in the CI rotation and we haven't had reports
of the same issues happening on later versions. Either the issues have
since been fixed or they were never an issue in Qt in the first place.

This commit has the additional benefit of getting rid of the following
shell error when qmake was run:
	sh: line 0: [: =: unary operator expected
as /etc/lsb-release hasn't contained DISTRIB_CODENAME for some time and
proper quoting was never implemented (not even qtcpsocket.pro).

Change-Id: Ia0aac2f09e9245339951ffff13c829e910ee64e9
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thiago Macieira 2015-03-03 18:16:03 -08:00
parent 4cdff7a0ea
commit 699e7a0869
7 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
View File

@ -3,4 +3,3 @@ TARGET = tst_qeasingcurve
QT = core testlib QT = core testlib
SOURCES = tst_qeasingcurve.cpp SOURCES = tst_qeasingcurve.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-32432

3
tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
View File

@ -427,9 +427,6 @@ void tst_QEasingCurve::setCustomType()
QCOMPARE(curve.valueForProgress(0.15), 0.1); QCOMPARE(curve.valueForProgress(0.15), 0.1);
QCOMPARE(curve.valueForProgress(0.20), 0.2); QCOMPARE(curve.valueForProgress(0.20), 0.2);
QCOMPARE(curve.valueForProgress(0.25), 0.2); QCOMPARE(curve.valueForProgress(0.25), 0.2);
#if defined(UBUNTU_ONEIRIC) && defined(__i386__)
QEXPECT_FAIL("", "QTBUG-32432: Fails on Ubuntu 11.10 32 bit configurations", Abort);
#endif
QCOMPARE(curve.valueForProgress(0.30), 0.3); QCOMPARE(curve.valueForProgress(0.30), 0.3);
QCOMPARE(curve.valueForProgress(0.35), 0.3); QCOMPARE(curve.valueForProgress(0.35), 0.3);
QCOMPARE(curve.valueForProgress(0.999999), 0.9); QCOMPARE(curve.valueForProgress(0.999999), 0.9);

2
tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
View File

@ -10,6 +10,4 @@ MOC_DIR=tmp
QT = core-private network-private testlib QT = core-private network-private testlib
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-23380
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

2
tests/auto/network/socket/qtcpsocket/qtcpsocket.pro
View File

@ -4,6 +4,4 @@ TEMPLATE = subdirs
!wince*: SUBDIRS = test stressTest !wince*: SUBDIRS = test stressTest
wince*|vxworks* : SUBDIRS = test wince*|vxworks* : SUBDIRS = test
linux-*:system(". /etc/lsb-release && [ "$DISTRIB_CODENAME" = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

2
tests/auto/network/ssl/qsslsocket/qsslsocket.pro
View File

@ -30,6 +30,4 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-24234
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

1
tests/auto/widgets/kernel/qwidget/qwidget.pro
View File

@ -23,4 +23,3 @@ x11 {
!wince*:win32:!winrt: LIBS += -luser32 -lgdi32 !wince*:win32:!winrt: LIBS += -luser32 -lgdi32
mac:CONFIG+=insignificant_test # QTBUG-25300, QTBUG-23695 mac:CONFIG+=insignificant_test # QTBUG-25300, QTBUG-23695
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-30566

6
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -5078,9 +5078,6 @@ void tst_QWidget::showAndMoveChild()
{ {
if (m_platform == QStringLiteral("wayland")) if (m_platform == QStringLiteral("wayland"))
QSKIP("Wayland: This fails. Figure out why."); QSKIP("Wayland: This fails. Figure out why.");
#if defined(UBUNTU_ONEIRIC)
QSKIP("QTBUG-30566 - Unstable auto-test");
#endif
QWidget parent(0, Qt::Window | Qt::WindowStaysOnTopHint); QWidget parent(0, Qt::Window | Qt::WindowStaysOnTopHint);
// prevent custom styles // prevent custom styles
parent.setStyle(QStyleFactory::create(QLatin1String("Windows"))); parent.setStyle(QStyleFactory::create(QLatin1String("Windows")));
@ -7871,9 +7868,6 @@ void tst_QWidget::doubleRepaint()
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
if (!macHasAccessToWindowsServer()) if (!macHasAccessToWindowsServer())
QSKIP("Not having window server access causes the wrong number of repaints to be issues"); QSKIP("Not having window server access causes the wrong number of repaints to be issues");
#endif
#if defined(UBUNTU_ONEIRIC)
QSKIP("QTBUG-30566 - Unstable auto-test");
#endif #endif
UpdateWidget widget; UpdateWidget widget;
centerOnScreen(&widget); centerOnScreen(&widget);