From 7d626363e44b703505baf7d77217d7e57ec4a38b Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sun, 10 Sep 2023 10:14:18 +0300 Subject: [PATCH] autotests: Remove old kernel checks CI runners have been upgraded. --- autotests/drm/drmTest.cpp | 22 -------------------- autotests/integration/screencasting_test.cpp | 7 ------- 2 files changed, 29 deletions(-) diff --git a/autotests/drm/drmTest.cpp b/autotests/drm/drmTest.cpp index ddfa860794..a3d6f20151 100644 --- a/autotests/drm/drmTest.cpp +++ b/autotests/drm/drmTest.cpp @@ -62,7 +62,6 @@ class DrmTest : public QObject { Q_OBJECT private Q_SLOTS: - void initTestCase(); void testAmsDetection(); void testOutputDetection(); void testZeroModesHandling(); @@ -73,27 +72,6 @@ private Q_SLOTS: void testModeset(); }; -static Version getKernelVersion() -{ - struct utsname name; - uname(&name); - - if (qstrcmp(name.sysname, "Linux") == 0) { - return Version::parseString(name.release); - } - return Version(0, 0, 0); -} - -void DrmTest::initTestCase() -{ - // TODO: Remove this when CI is updated to ubuntu 22.04 or something with a newer kernel. - const Version kernelVersion = getKernelVersion(); - if (kernelVersion.majorVersion() == 5 && kernelVersion.minorVersion() <= 4) { - QSKIP("drmPrimeFDToHandle() randomly fails"); - return; - } -} - static void verifyCleanup(MockGpu *mockGpu) { QVERIFY(mockGpu->drmConnectors.isEmpty()); diff --git a/autotests/integration/screencasting_test.cpp b/autotests/integration/screencasting_test.cpp index e130cd7d0b..341ef89f9e 100644 --- a/autotests/integration/screencasting_test.cpp +++ b/autotests/integration/screencasting_test.cpp @@ -12,7 +12,6 @@ #include "libkwineffects/glplatform.h" #include "pointer_input.h" #include "scene/workspacescene.h" -#include "utils/kernel.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" @@ -92,12 +91,6 @@ private: void ScreencastingTest::init() { - // TODO: Remove this when CI is updated to ubuntu 22.04 or something with a newer kernel. - const Version kernelVersion = linuxKernelVersion(); - if (kernelVersion.majorVersion() == 5 && kernelVersion.minorVersion() <= 4) { - QSKIP("drmPrimeFDToHandle() randomly fails"); - return; - } QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::ScreencastingV1)); QVERIFY(KWin::Test::screencasting()); Cursors::self()->hideCursor();