From a8131f05b9b3290fa4888c617adbbb6253d2b410 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Fri, 6 Mar 2020 13:05:03 +0100 Subject: Blacklist tst_QAudioOutput tests if it is running in CI Fixes: QTBUG-82683 Fixes: QTBUG-82684 Change-Id: I82387bf4685f96c77a6658a9f8360e89335ba23c Reviewed-by: Liang Qi --- tests/auto/integration/qaudiooutput/BLACKLIST | 3 +-- tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 14 -------------- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index c83b30412..966b48af6 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -1,2 +1 @@ -[pullSuspendResume] -opensuse-42.3 +linux ci diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index f3a676073..9943ffec2 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -116,8 +116,6 @@ private: QScopedPointer m_byteArray; QScopedPointer m_buffer; - - bool m_inCISystem; }; QString tst_QAudioOutput::formatToFileName(const QAudioFormat &format) @@ -190,9 +188,6 @@ void tst_QAudioOutput::generate_audiofile_testrows() QTest::newRow(QString("Audio File %1").arg(i).toLocal8Bit().constData()) << audioFiles.at(i) << testFormats.at(i); - // Only run first format in CI system to reduce test times - if (m_inCISystem) - break; } } @@ -278,7 +273,6 @@ void tst_QAudioOutput::initTestCase() file->close(); audioFiles.append(file); } - qgetenv("QT_TEST_CI").toInt(&m_inCISystem,10); } void tst_QAudioOutput::format() @@ -549,10 +543,6 @@ void tst_QAudioOutput::pull() void tst_QAudioOutput::pullSuspendResume() { -#ifdef Q_OS_LINUX - if (m_inCISystem) - QSKIP("QTBUG-26504 Fails 20% of time with pulseaudio backend"); -#endif QFETCH(FilePtr, audioFile); QFETCH(QAudioFormat, audioFormat); QAudioOutput audioOutput(audioFormat, this); @@ -726,10 +716,6 @@ void tst_QAudioOutput::push() void tst_QAudioOutput::pushSuspendResume() { -#ifdef Q_OS_LINUX - if (m_inCISystem) - QSKIP("QTBUG-26504 Fails 20% of time with pulseaudio backend"); -#endif QFETCH(FilePtr, audioFile); QFETCH(QAudioFormat, audioFormat); -- cgit v1.2.3