diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-31 12:35:53 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 03:19:01 (GMT) |
| commit | 8d2feb62ae8bac0fb620fa1d047f347be75fbe0e (patch) | |
| tree | c4dfa2bfb8099c80995afedc09ae5553072498fb | |
| parent | 96494581c00ebc0bc110feaf59f04e0168418faf (diff) | |
| download | Qt-8d2feb62ae8bac0fb620fa1d047f347be75fbe0e.zip Qt-8d2feb62ae8bac0fb620fa1d047f347be75fbe0e.tar.gz Qt-8d2feb62ae8bac0fb620fa1d047f347be75fbe0e.tar.bz2 | |
test: Re-enable tst_QMdiArea test.
The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-26726
Change-Id: I7b59609f71d35af27b56f62eedc9bbef4adb7f65
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rw-r--r-- | tests/auto/qmdiarea/qmdiarea.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qmdiarea/tst_qmdiarea.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro index 90fe9f4..4aacc6b 100644 --- a/tests/auto/qmdiarea/qmdiarea.pro +++ b/tests/auto/qmdiarea/qmdiarea.pro @@ -12,4 +12,4 @@ mac { LIBS += -framework Security } -CONFIG+=insignificant_test # QTQAINFRA-428 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):DEFINES+=UBUNTU_LUCID # QTBUG-26726 diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp index 3c864b3..9ae9d45 100644 --- a/tests/auto/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp @@ -1789,6 +1789,9 @@ void tst_QMdiArea::tileSubWindows() QTRY_VERIFY(workspace.size() != QSize(150, 150)); QTRY_VERIFY(!vBar->isVisible()); +#if defined(UBUNTU_LUCID) && !defined(Q_WS_QWS) + QEXPECT_FAIL("", "QTBUG-26726", Abort); +#endif QTRY_VERIFY(!hBar->isVisible()); } |