diff options
Diffstat (limited to 'tests/auto/integration')
3 files changed, 4 insertions, 12 deletions
diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index abc0b934b..9d44dc16f 100644 --- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp @@ -190,7 +190,7 @@ void tst_QAudioDeviceInfo::supportedSampleRates() void tst_QAudioDeviceInfo::assignOperator() { QAudioDeviceInfo dev; - QVERIFY(dev.deviceName() == NULL); + QVERIFY(dev.deviceName().isNull()); QVERIFY(dev.isNull() == true); QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); @@ -204,7 +204,7 @@ void tst_QAudioDeviceInfo::assignOperator() // Returns human readable name of audio device void tst_QAudioDeviceInfo::deviceName() { - QVERIFY(device->deviceName() != NULL); + QVERIFY(!device->deviceName().isNull()); QVERIFY(device->deviceName() == QAudioDeviceInfo::availableDevices(QAudio::AudioOutput).at(0).deviceName()); } @@ -213,7 +213,7 @@ void tst_QAudioDeviceInfo::defaultConstructor() { QAudioDeviceInfo dev; QVERIFY(dev.isNull() == true); - QVERIFY(dev.deviceName() == NULL); + QVERIFY(dev.deviceName().isNull()); } void tst_QAudioDeviceInfo::equalityOperator() diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index 43b8e8b26..5560abf75 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -19,13 +19,8 @@ opensuse-13.1 64bit windows 64bit developer-build [playPauseStop] -opensuse-13.1 64bit -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -ubuntu-14.04 64bit -ubuntu-16.04 64bit +linux windows 64bit developer-build -rhel-7.2 [processEOS] opensuse-13.1 64bit diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro index 7a0f63e4b..c4d965121 100644 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro @@ -14,6 +14,3 @@ unix:!mac { } TESTDATA += test.wav - - -config_pulseaudio: CONFIG += insignificant_testcase # Crashes in QSoundEffectPrivate::sampleReady with bufferAttr == 0 |