summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/integration')
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/BLACKLIST41
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro2
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/BLACKLIST4
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro2
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudioinput/tst_qaudioinput.cpp0
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudioinput/wavheader.cpp0
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudioinput/wavheader.h0
-rw-r--r--tests/auto/integration/qaudiooutput/BLACKLIST4
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp0
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudiooutput/wavheader.cpp0
-rw-r--r--[-rwxr-xr-x]tests/auto/integration/qaudiooutput/wavheader.h0
-rw-r--r--tests/auto/integration/qmediaplayerbackend/BLACKLIST62
-rw-r--r--tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro2
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp11
-rw-r--r--tests/auto/integration/qsoundeffect/BLACKLIST6
-rw-r--r--tests/auto/integration/qsoundeffect/qsoundeffect.pro4
16 files changed, 128 insertions, 10 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
new file mode 100644
index 000000000..038b89022
--- /dev/null
+++ b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
@@ -0,0 +1,41 @@
+# QTBUG-46331
+
+[fileTest]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+osx-10.8
+osx-10.9
+osx-10.10
+osx-10.11
+windows 32bit developer-build
+windows 64bit developer-build
+
+[unsupportedFileTest]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+osx-10.8
+osx-10.9
+osx-10.10
+osx-10.11
+windows 32bit developer-build
+windows 64bit developer-build
+
+[corruptedFileTest]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+osx-10.8
+osx-10.9
+osx-10.10
+osx-10.11
+windows 32bit developer-build
+windows 64bit developer-build
+
+[deviceTest]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+osx-10.8
+osx-10.9
+osx-10.10
+osx-10.11
+windows 32bit developer-build
+windows 64bit developer-build
diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
index 80ce0c112..c9f5a089c 100644
--- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
+++ b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
@@ -3,7 +3,7 @@ TARGET = tst_qaudiodecoderbackend
QT += multimedia multimedia-private testlib
# This is more of a system test
-CONFIG += testcase insignificant_test
+CONFIG += testcase
TESTDATA += testdata/*
INCLUDEPATH += \
diff --git a/tests/auto/integration/qaudiodeviceinfo/BLACKLIST b/tests/auto/integration/qaudiodeviceinfo/BLACKLIST
new file mode 100644
index 000000000..40dc63a09
--- /dev/null
+++ b/tests/auto/integration/qaudiodeviceinfo/BLACKLIST
@@ -0,0 +1,4 @@
+# QTBUG-46409
+
+[deviceName]
+redhatenterpriselinuxworkstation-6.6
diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
index 69bd792bc..98ed7e69c 100644
--- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -3,7 +3,7 @@ TARGET = tst_qaudiodeviceinfo
QT += core multimedia-private testlib
# This is more of a system test
-CONFIG += testcase insignificant_test
+CONFIG += testcase
SOURCES += tst_qaudiodeviceinfo.cpp
diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
index 242787841..242787841 100755..100644
--- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
diff --git a/tests/auto/integration/qaudioinput/wavheader.cpp b/tests/auto/integration/qaudioinput/wavheader.cpp
index adb28e7a7..adb28e7a7 100755..100644
--- a/tests/auto/integration/qaudioinput/wavheader.cpp
+++ b/tests/auto/integration/qaudioinput/wavheader.cpp
diff --git a/tests/auto/integration/qaudioinput/wavheader.h b/tests/auto/integration/qaudioinput/wavheader.h
index 04fd951f6..04fd951f6 100755..100644
--- a/tests/auto/integration/qaudioinput/wavheader.h
+++ b/tests/auto/integration/qaudioinput/wavheader.h
diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST
new file mode 100644
index 000000000..e640ef926
--- /dev/null
+++ b/tests/auto/integration/qaudiooutput/BLACKLIST
@@ -0,0 +1,4 @@
+[pullSuspendResume]
+redhatenterpriselinuxworkstation-6.6
+ubuntu-14.04
+opensuse-13.1 64bit
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index b887d3f9a..b887d3f9a 100755..100644
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
diff --git a/tests/auto/integration/qaudiooutput/wavheader.cpp b/tests/auto/integration/qaudiooutput/wavheader.cpp
index adb28e7a7..adb28e7a7 100755..100644
--- a/tests/auto/integration/qaudiooutput/wavheader.cpp
+++ b/tests/auto/integration/qaudiooutput/wavheader.cpp
diff --git a/tests/auto/integration/qaudiooutput/wavheader.h b/tests/auto/integration/qaudiooutput/wavheader.h
index 04fd951f6..04fd951f6 100755..100644
--- a/tests/auto/integration/qaudiooutput/wavheader.h
+++ b/tests/auto/integration/qaudiooutput/wavheader.h
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
new file mode 100644
index 000000000..9f0d4b746
--- /dev/null
+++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
@@ -0,0 +1,62 @@
+# QTBUG-46368
+
+osx-10.8
+osx-10.9
+osx-10.10
+osx-10.11
+windows 32bit developer-build
+windows 64bit developer-build
+
+[construction]
+opensuse-13.1 64bit
+
+[loadMedia]
+opensuse-13.1 64bit
+windows 64bit developer-build
+
+[unloadMedia]
+opensuse-13.1 64bit
+windows 64bit developer-build
+
+[playPauseStop]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+ubuntu-14.04 64bit
+windows 64bit developer-build
+
+[processEOS]
+opensuse-13.1 64bit
+windows 64bit developer-build
+
+[deleteLaterAtEOS]
+opensuse-13.1 64bit
+windows 64bit developer-build
+
+[volumeAndMuted]
+opensuse-13.1 64bit
+
+[volumeAcrossFiles]
+opensuse-13.1 64bit
+
+[initialVolume]
+opensuse-13.1 64bit
+windows 64bit developer-build
+
+[playlist]
+opensuse-13.1 64bit
+redhatenterpriselinuxworkstation-6.6
+
+[seekPauseSeek]
+redhatenterpriselinuxworkstation-6.6
+
+[seekInStoppedState]
+redhatenterpriselinuxworkstation-6.6
+
+[subsequentPlayback]
+redhatenterpriselinuxworkstation-6.6
+
+[probes]
+redhatenterpriselinuxworkstation-6.6
+
+[surfaceTest]
+redhatenterpriselinuxworkstation-6.6
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index 79028d885..a2c1bdf87 100644
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -3,7 +3,7 @@ TARGET = tst_qmediaplayerbackend
QT += multimedia-private testlib
# This is more of a system test
-CONFIG += testcase insignificant_test
+CONFIG += testcase
SOURCES += \
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 916f70eff..c032734c5 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -220,13 +220,13 @@ void tst_QMediaPlayerBackend::initTestCase()
qRegisterMetaType<QMediaContent>();
QStringList mediaCandidates;
- mediaCandidates << QFINDTESTDATA("testdata/colors.ogv");
mediaCandidates << QFINDTESTDATA("testdata/colors.mp4");
+ mediaCandidates << QFINDTESTDATA("testdata/colors.ogv");
localVideoFile = selectMediaFile(mediaCandidates);
mediaCandidates.clear();
- mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mkv");
mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mp3");
+ mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mkv");
localCompressedSoundFile = selectMediaFile(mediaCandidates);
localFileWithMetadata = selectMediaFile(QStringList() << QFINDTESTDATA("testdata/nokia-tune.mp3"));
@@ -478,7 +478,7 @@ void tst_QMediaPlayerBackend::processEOS()
//position is reset to start
QTRY_VERIFY(player.position() < 100);
- QVERIFY(positionSpy.count() > 0);
+ QTRY_VERIFY(positionSpy.count() > 0);
QCOMPARE(positionSpy.first()[0].value<qint64>(), 0);
QCOMPARE(player.state(), QMediaPlayer::PlayingState);
@@ -720,7 +720,7 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
player.pause();
QTRY_COMPARE(player.state(), QMediaPlayer::PausedState); // it might take some time for the operation to be completed
- QTRY_COMPARE(surface->m_frameList.size(), 1); // we must see a frame at position 7000 here
+ QTRY_VERIFY(!surface->m_frameList.isEmpty()); // we must see a frame at position 7000 here
{
QVideoFrame frame = surface->m_frameList.back();
@@ -739,12 +739,13 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
frame.unmap();
}
+ surface->m_frameList.clear();
positionSpy.clear();
position = 12000;
player.setPosition(position);
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500);
QCOMPARE(player.state(), QMediaPlayer::PausedState);
- QCOMPARE(surface->m_frameList.size(), 2);
+ QVERIFY(!surface->m_frameList.isEmpty());
{
QVideoFrame frame = surface->m_frameList.back();
diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST
new file mode 100644
index 000000000..f290cc8ff
--- /dev/null
+++ b/tests/auto/integration/qsoundeffect/BLACKLIST
@@ -0,0 +1,6 @@
+# QTBUG-46689
+
+[testLooping]
+ubuntu-14.04 64bit
+redhatenterpriselinuxworkstation-6.6
+opensuse-13.1
diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
index cb186db20..bce5fc77a 100644
--- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
@@ -15,6 +15,6 @@ unix:!mac {
TESTDATA += test.wav
-win32:CONFIG += insignificant_test # QTBUG-26509
-linux-*:CONFIG += insignificant_test # QTBUG-26748
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+config_pulseaudio: CONFIG += insignificant_testcase # Crashes in QSoundEffectPrivate::sampleReady with bufferAttr == 0