diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:04:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:04:50 +0200 |
| commit | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (patch) | |
| tree | 6408aa52426dcd7d77ab21358f11a3dcb10dc4ca /tests | |
| parent | 3c278e96ce62f5211b2d2a700f233653a3ce64e6 (diff) | |
| parent | 7f502f32d9cc08bca841962511bbfabab1334b43 (diff) | |
| download | qtmultimedia-7b0cae6c4f9f417e14a1553cd206bd929d299dbb.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8027e798d85ae60dbcb4fbc8592e3992af7546d4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qaudioinput/BLACKLIST | 7 | ||||
| -rw-r--r-- | tests/auto/integration/qaudioinput/qaudioinput.pro | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qaudiooutput/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/integration/qsoundeffect/BLACKLIST | 1 |
5 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST new file mode 100644 index 000000000..f6a8a670f --- /dev/null +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -0,0 +1,7 @@ +#QTBUG-49736 +[pushSuspendResume] +redhatenterpriselinuxworkstation-6.6 +rhel-7.2 +ubuntu-14.04 +opensuse-13.1 +opensuse-42.1 diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro index 737ff6c23..31de98eb0 100644 --- a/tests/auto/integration/qaudioinput/qaudioinput.pro +++ b/tests/auto/integration/qaudioinput/qaudioinput.pro @@ -3,7 +3,7 @@ TARGET = tst_qaudioinput QT += core multimedia-private testlib # This is more of a system test -CONFIG += testcase insignificant_test +CONFIG += testcase HEADERS += wavheader.h SOURCES += wavheader.cpp tst_qaudioinput.cpp diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index 4d45efe06..e6cd7c846 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -1,5 +1,8 @@ +#QTBUG-52673 [pullSuspendResume] redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 opensuse-13.1 64bit +opensuse-42.1 +rhel-7.2 diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index b55c167ac..7ce72c7ac 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -24,6 +24,7 @@ redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 64bit windows 64bit developer-build +rhel-7.2 [processEOS] opensuse-13.1 64bit diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST index 1feeb4b5f..3a358789a 100644 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ b/tests/auto/integration/qsoundeffect/BLACKLIST @@ -5,3 +5,4 @@ ubuntu-14.04 64bit redhatenterpriselinuxworkstation-6.6 rhel-7.1 opensuse-13.1 +rhel-7.2 |