diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:23:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:23:28 +0200 |
| commit | f979916804fdcea14e2a560336f31f4046fbe84a (patch) | |
| tree | b5ff5737a4a9dd187c056b010e329ed1d601db0f /tests/auto | |
| parent | 9bdc7c84eea0ff66c937d5f62ffed249321c3c35 (diff) | |
| parent | 339944b284e9dd11302dd013f9d9a10ad0d9055a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/auto/integration/qsoundeffect/BLACKLIST
Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/integration/qsoundeffect/BLACKLIST | 10 | ||||
| -rw-r--r-- | tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST deleted file mode 100644 index 6c4534ad6..000000000 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ /dev/null @@ -1,10 +0,0 @@ -# QTBUG-46689 - -[testLooping] -ubuntu-14.04 64bit -ubuntu-16.04 -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -opensuse-13.1 -rhel-7.2 -opensuse-42.1 diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index dd486a1a3..5be889096 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -183,7 +183,7 @@ void tst_QSoundEffect::testLooping() // wait for all the loops to be completed QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 6); + QTRY_VERIFY(readSignal_Remaining.count() >= 6); QTRY_VERIFY(!sound->isPlaying()); } @@ -198,7 +198,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 0); sound->play(); - QCOMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); + QTRY_COMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); QCOMPARE(readSignal_Remaining.count(), 1); QTest::qWait(1500); @@ -214,7 +214,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 1); QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 2); + QTRY_VERIFY(readSignal_Remaining.count() >= 2); QTRY_VERIFY(!sound->isPlaying()); } } |