From 5256338772aea067cffe2e0284bba0acfa3a078e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Mon, 18 Sep 2017 21:05:34 +0200 Subject: [PATCH] [autotests] Force more tests to use evdev as XKB_DEFAULT_RULES Should help fixing the tests on FreeBSD. --- autotests/integration/globalshortcuts_test.cpp | 1 + autotests/integration/pointer_input.cpp | 1 + autotests/integration/quick_tiling_test.cpp | 2 ++ autotests/integration/window_selection_test.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp index 11a7199c3a..6a4024f00b 100644 --- a/autotests/integration/globalshortcuts_test.cpp +++ b/autotests/integration/globalshortcuts_test.cpp @@ -71,6 +71,7 @@ void GlobalShortcutsTest::initTestCase() kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1"); + qputenv("XKB_DEFAULT_RULES", "evdev"); kwinApp()->start(); QVERIFY(workspaceCreatedSpy.wait()); diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index de43a3af23..1fb5d04a20 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -99,6 +99,7 @@ void PointerInputTest::initTestCase() qputenv("XCURSOR_THEME", QByteArrayLiteral("DMZ-White")); qputenv("XCURSOR_SIZE", QByteArrayLiteral("24")); + qputenv("XKB_DEFAULT_RULES", "evdev"); kwinApp()->start(); QVERIFY(workspaceCreatedSpy.wait()); diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp index ffee16ce20..690d2e7e09 100644 --- a/autotests/integration/quick_tiling_test.cpp +++ b/autotests/integration/quick_tiling_test.cpp @@ -101,6 +101,8 @@ void QuickTilingTest::initTestCase() kwinApp()->setConfig(config); + qputenv("XKB_DEFAULT_RULES", "evdev"); + kwinApp()->start(); QVERIFY(workspaceCreatedSpy.wait()); QCOMPARE(screens()->count(), 2); diff --git a/autotests/integration/window_selection_test.cpp b/autotests/integration/window_selection_test.cpp index b9b17ae57c..a04cb77568 100644 --- a/autotests/integration/window_selection_test.cpp +++ b/autotests/integration/window_selection_test.cpp @@ -71,6 +71,7 @@ void TestWindowSelection::initTestCase() kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); QMetaObject::invokeMethod(kwinApp()->platform(), "setOutputCount", Qt::DirectConnection, Q_ARG(int, 2)); QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); + qputenv("XKB_DEFAULT_RULES", "evdev"); kwinApp()->start(); QVERIFY(workspaceCreatedSpy.wait());