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

Revert "[autotest] Let's dare enabling the OpenGL compositor in the tests"

Browse source 
This reverts commit 5e21963a3b.

Unfortunately all tests failed on the CI system, so no GL yet :-(
This commit is contained in:
Martin Gräßlin 2016-02-12 15:22:55 +01:00
parent 5e21963a3b
commit fed7a48112
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autotests/wayland/dont_crash_glxgears.cpp
View file

@ -43,7 +43,6 @@ private Q_SLOTS:
void DontCrashGlxgearsTest::initTestCase() void DontCrashGlxgearsTest::initTestCase()
{ {
qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q"));
qRegisterMetaType<KWin::Deleted*>(); qRegisterMetaType<KWin::Deleted*>();
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
QVERIFY(workspaceCreatedSpy.isValid()); QVERIFY(workspaceCreatedSpy.isValid());

2
autotests/wayland/kwin_wayland_test.cpp
View file

@ -46,7 +46,7 @@ WaylandTestApplication::WaylandTestApplication(int &argc, char **argv)
#ifdef KWIN_BUILD_ACTIVITIES #ifdef KWIN_BUILD_ACTIVITIES
setUseKActivities(false); setUseKActivities(false);
#endif #endif
qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q"));
WaylandServer *server = WaylandServer::create(this); WaylandServer *server = WaylandServer::create(this);
QPluginLoader loader(QStringLiteral(KWINBACKENDPATH)); QPluginLoader loader(QStringLiteral(KWINBACKENDPATH));
loader.instance()->setParent(server); loader.instance()->setParent(server);