summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-232-13/+2
|\ | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| * Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-222-13/+2
| |\ | | | | | | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | * Stabilize tst_QAudioOutput::pullSuspendResume()Yoann Lopes2016-09-212-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't wait after resume(); the test is meant to check the state of the QAudioOutput right after the call, not later. The state and the error status are supposed to change immediately, even if the backend runs in another thread. Ignore any state change that can happen because of underrun errors (likely to happen on CI). Removed the test from blacklist. Change-Id: Idaef6a9e0dfcfc89424fb2383cf3830a3184f975 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Make tst_QMediaObject::notifySignals() less flakyYoann Lopes2016-09-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than expecting a certain amount of signals to be fired within a fixed period, check that all the required signals are emitted and that it doesn't take longer than expected. Use a margin of error to take into account timers firing later because of high system load. Change-Id: I1569ce524e87efc47eb8d11066e509e5dc90f6f8 (cherry picked from commit 586abbd9732f9ccce127429fe0698c25a09ecefb) Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-194-0/+67222
|\| | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-172-0/+33179
| |\| | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | * BC data files for QtMultimedia for Qt 5.6Milla Pohjanheimo2016-09-142-0/+33179
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I02ea21c1cfbd1087475f04a516cf524fa1ce878a Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | BC data files added for QtMultimedia (5.7)Milla Pohjanheimo2016-09-152-0/+34043
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtMultimedia for Qt 5.7. Change-Id: I380e472d912d4e34d1129e922ead00c94ef0ac9c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Add BLACKLIST for QSoundEffectMaurice Kalinowski2016-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | Blacklisting testSetSourceWhileLoading on all Linux distros. Change-Id: I024fcda458be2764d386897fec257731e67ab95d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Adjust to qtConfig() changes in qtbaseLars Knoll2016-08-192-5/+3
| | | | | | | | | | | | | | | | | | Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-172-3/+35
|\| | | | | | | | | | | Change-Id: Ib8d05d6e21c7beb19f618cd1edc52d248b1e43b8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+27
| |\| | | | | | | | | | Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161
| | * Improve tst_QMediaPlayerBackend::playPauseStop()Yoann Lopes2016-08-121-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Check the state of the media player when trying to play or pause without a loaded media. Change-Id: I6685f196457630eb9f4e834426c8e1b9a9eaf8dc Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Make tst_QMediaObject::notifySignals() less flakyYoann Lopes2016-08-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than expecting a certain amount of signals to be fired within a fixed period, check that all the required signals are emitted and that it doesn't take longer than expected. Use a margin of error to take into account timers firing later because of high system load. Change-Id: I7f77d32a9db3d09881eadbd0dfc6b70f62757d09 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-4/+4
|\| | | | | | | | | | | Change-Id: I0e74582a735dd8fd169ac928a32143ab80a2d2a0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-041-4/+4
| |\| | | | | | | | | | Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
| | * Give more time before timeout in some tst_QAudioInput testsYoann Lopes2016-08-041-4/+4
| | | | | | | | | | | | | | | Change-Id: If2336e9c550ef8264d0853be83972a6170a9746b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | tst_QAudioDeviceInfo: don't do implicit cast from NULL to char*Yoann Lopes2016-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use QString::isNull() rather than QString() == NULL. Task-number: QTBUG-55154 Change-Id: I3860caa504ed3abda6c525b93e9d232a708b7f0b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-022-13/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/integration/qsoundeffect/BLACKLIST Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-08-012-11/+3
| |\| | | | | | | | | | Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
| | * tst_qsoundeffect: Update to case testLoopingTuomas Heimonen2016-07-042-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more permissive while checking loops remaining. Remove file BLACKLIST Task-number: QTBUG-46689 Change-Id: I15b5fb55ee770a190b2c21dd8cf1fad45665a73c Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-211-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/directshow/player/directshowiosource.cpp One side disintermediated filling a vector; the other reduced it to one entry. src/plugins/directshow/player/directshowiosource.h One side renamed a member, the other added another adjacent to it. src/plugins/pulseaudio/qpulseaudioengine.h One side added a header, the other replaced the next with a different header. Change-Id: I3a031975f5af43ca39cca571f215c612f640b7d6
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-301-6/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted a few functions in tst_QAudioInput. Conflicts: .qmake.conf src/plugins/avfoundation/camera/avfcameracontrol.mm src/plugins/avfoundation/camera/avfcameraservice.h src/plugins/avfoundation/camera/avfcameraservice.mm src/plugins/avfoundation/camera/avfcamerasession.h src/plugins/avfoundation/camera/avfcamerasession.mm src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm src/plugins/avfoundation/camera/avfimagecapturecontrol.mm src/plugins/avfoundation/camera/avfimageencodercontrol.mm src/plugins/avfoundation/camera/avfmediarecordercontrol.h src/plugins/avfoundation/camera/avfmediarecordercontrol.mm tests/auto/integration/qaudioinput/BLACKLIST Task-number: QTBUG-54459 Task-number: QTBUG-49736 Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
* | | Blacklisting playPauseStop() on all LinuxesMilla Pohjanheimo2016-07-061-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the blacklisting of playPauseStop() to be "linux" instead of separately blacklisting it for each Linux distribution, since it's failing on all. Change-Id: I0b545423bf598b7487722bd5dda2d236be7131f6 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Add LogarithmicVolumeScale to VolumeScale enum.Yoann Lopes2016-06-142-0/+94
| | | | | | | | | | | | | | | Change-Id: I0b556b5f705825fc8c8135305bda4bc860ffbf14 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Blacklisting tst_QSoundEffect::testLooping on Ubuntu 16.04Milla Pohjanheimo2016-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test in question has been blacklisted already for Ubuntu 14.04, and since it fails on Ubuntu 16.04 also, we need to blacklist it. Task-number: QTBUG-46689 Change-Id: I04eeb50031ddb622e62d895df37fd685a6f059f8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-112-0/+2
|\| | | | | | | | | | | Change-Id: Iffd8d86489161c49a647cae77a31f5451b06cf4b
| * | Blacklist cases from qaudiodecoderbackend in Ubuntu 16.04v5.7.0-rc1Simo Fält2016-05-231-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I0482247ce2f24d1b47f32fe403db8587b6f92abc Task-number: QTBUG-46368 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Blacklisting pushSuspendResume for Ubuntu 16.04Milla Pohjanheimo2016-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test is failing on all Linux distributions. Blacklisting it for Ubuntu 16.04 too. Task-number: QTBUG-49736 Change-Id: I24d6387fabd9257a36589ccd1b3d63092c9dc0c1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Add new volume conversion API.Yoann Lopes2016-06-032-1/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Qt Multimedia volume APIs expect a linear volume factor. However, UI volume controls should typically use a logarithmic or cubic scale to match how the human ear perceives loudness. The new helper function (C++ and QML) provides a way to do the conversion from one scale to another. Change-Id: If7795426b728ab0e8fd6635988dbc9be795e3e5e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Blacklisting tst_QSoundEffect::testLooping on OpenSUSE 42.1Milla Pohjanheimo2016-06-022-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted testLooping() on OpenSUSE 42.1 and removed 'insignificant_testcase' CONFIG, which was a typo in any case. It should be 'insignificant_test'. Also we should get rid of the tests marked as insignificant in any case. Task-number: QTBUG-46689 Change-Id: Idcf9589e26d066e664cf68e6c25c03f4d1973287 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-4/+2
|\| | | | | | | | | | | Change-Id: I5aedca14c2bd454de0c274eeca88d15b83ae07a5
| * | Stabilize tst_QAudioOutput::pull().Yoann Lopes2016-05-111-4/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53297 Change-Id: I521b9b3594016197228676648f97f568a8db0a7e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-134-47/+15
|\| | | | | | | | | | | Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-103-47/+8
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| | * decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | | | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I6d8c623f41c633babe5923344c915412d3d6bcd4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * tests: skip tst_qaudiodecoderbackend when no audio decoding supportLiang Qi2016-04-082-41/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46331 Change-Id: I9168ae7d89869cc0811394fc4091a5e44c136b9b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Skip integration tests when the service is not available.Yoann Lopes2016-05-092-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Don't try to run the player and audio decoder integration tests when the relevant services are not available. Change-Id: I34b0e68e11e3e81ad7bef8c1b6b840379ef54b7c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-065-1/+13
|\| | | | | | | | | | | Change-Id: I8027e798d85ae60dbcb4fbc8592e3992af7546d4
| * | Blacklist tst_qaudioinput and tst_qaudiooutput tests from OpenSUSE 42.1Milla Pohjanheimo2016-04-273-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the 'insignificant_test' config and instead blacklisting just the failing test QAudioInput::pushSuspendResume on those platforms where it fails. Also blacklisting QAudioOutput::pullSuspendResume from OpenSUSE 42.1 Task-number: QTBUG-49736 Task-number: QTBUG-52673 Change-Id: I14a32db371680d9b2d6112c13ca353622d98f380 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | tst_qaudioinput blacklist pushSuspendResume on RHEL 7.2Milla Pohjanheimo2016-04-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | To get RHEL 7.2 in the CI, we need to blacklist this failing test Task-number: QTBUG-49736 Change-Id: I4c2c587770a214230c9116d2984ad327f22388a7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Blacklist qtmultimedia autotests that have been failing since RHEL 6.6Milla Pohjanheimo2016-04-193-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted tests in RHEL 7.2: pullSuspendResume() from tst_qaudiooutput, playPauseStop() from tst_qmediaplayerbackend and testLooping() from tst_qsoundeffect Task-number: QTBUG-52673 Task-number: QTBUG-46368 Task-number: QTBUG-46689 Change-Id: If43763e5d6083492a79bb555a165c35217237201 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
* | | Remove Windows CE.Friedemann Kleint2016-04-281-7/+0
|/ / | | | | | | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses. Task-number: QTBUG-51673 Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+2
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * tst_qdeclarativeaudio: fix ubsan buildMarc Mutz2016-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | The test uses QDeclarativePlaylist, but no out-of-line methods or data members, so it got by with just including the header. But a ubsan build requires access to the class' typeinfo objects, so add QDeclarativePlaylist's implementation to the test, too. Change-Id: Ib6bb155b71c0082969f77a13a0e50132a782db2d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0718-54/+48
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
| * Fix constructor parameters in tst_QMediaPlaylist.Friedemann Kleint2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | Fix warning: tst_qmediaplaylist.cpp: In member function 'void tst_QMediaPlaylist::mediaPlayListControl()': tst_qmediaplaylist.cpp:1221:49: warning: the address of 'parent' will always evaluate as 'true' [-Waddress] Change-Id: I46391550d07a8f58442269d0e5eae418258adbff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * remove redundant statements from project filesOswald Buddenhagen2016-02-2517-23/+12
| | | | | | | | | | | | | | | | | | | | - TARGET is unnecessary if it matches the project file's basename - CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf - load(qt_build_config) is done by .qmake.conf Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-255-35/+35
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-153-0/+3
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If5d9ea0fb6187bb6f74881289ebb15a57eb82e0c