yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotests: Remove old kernel checks

Browse source 
CI runners have been upgraded.
This commit is contained in:
Vlad Zahorodnii 2023-09-10 10:14:18 +03:00
parent 32ae9dd7d1
commit 7d626363e4
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
autotests/drm/drmTest.cpp
View file

@ -62,7 +62,6 @@ class DrmTest : public QObject
{ {
Q_OBJECT Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
void initTestCase();
void testAmsDetection(); void testAmsDetection();
void testOutputDetection(); void testOutputDetection();
void testZeroModesHandling(); void testZeroModesHandling();
@ -73,27 +72,6 @@ private Q_SLOTS:
void testModeset(); 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) static void verifyCleanup(MockGpu *mockGpu)
{ {
QVERIFY(mockGpu->drmConnectors.isEmpty()); QVERIFY(mockGpu->drmConnectors.isEmpty());

7
autotests/integration/screencasting_test.cpp
View file

@ -12,7 +12,6 @@
#include "libkwineffects/glplatform.h" #include "libkwineffects/glplatform.h"
#include "pointer_input.h" #include "pointer_input.h"
#include "scene/workspacescene.h" #include "scene/workspacescene.h"
#include "utils/kernel.h"
#include "wayland_server.h" #include "wayland_server.h"
#include "window.h" #include "window.h"
#include "workspace.h" #include "workspace.h"
@ -92,12 +91,6 @@ private:
void ScreencastingTest::init() 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(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::ScreencastingV1));
QVERIFY(KWin::Test::screencasting()); QVERIFY(KWin::Test::screencasting());
Cursors::self()->hideCursor(); Cursors::self()->hideCursor();