From eb9e5a178fb1a27901d72b84b1954210bf178e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 23 Sep 2014 12:00:17 +0200 Subject: [PATCH] Switch all auto tests to QTEST_GUILESS_MAIN We don't need a QGuiApplication in the tests. --- src/wayland/autotests/client/test_shm_pool.cpp | 2 +- src/wayland/autotests/client/test_wayland_connection_thread.cpp | 2 +- src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp | 2 +- src/wayland/autotests/client/test_wayland_output.cpp | 2 +- src/wayland/autotests/client/test_wayland_registry.cpp | 2 +- src/wayland/autotests/client/test_wayland_seat.cpp | 2 +- src/wayland/autotests/client/test_wayland_shell.cpp | 2 +- src/wayland/autotests/client/test_wayland_surface.cpp | 2 +- src/wayland/autotests/server/test_display.cpp | 2 +- src/wayland/autotests/server/test_seat.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/wayland/autotests/client/test_shm_pool.cpp b/src/wayland/autotests/client/test_shm_pool.cpp index 45e238b6bf..6e25345136 100644 --- a/src/wayland/autotests/client/test_shm_pool.cpp +++ b/src/wayland/autotests/client/test_shm_pool.cpp @@ -230,5 +230,5 @@ void TestShmPool::testDestroy() m_shmPool->destroy(); } -QTEST_MAIN(TestShmPool) +QTEST_GUILESS_MAIN(TestShmPool) #include "test_shm_pool.moc" diff --git a/src/wayland/autotests/client/test_wayland_connection_thread.cpp b/src/wayland/autotests/client/test_wayland_connection_thread.cpp index 5e1022471a..a1ef989b05 100644 --- a/src/wayland/autotests/client/test_wayland_connection_thread.cpp +++ b/src/wayland/autotests/client/test_wayland_connection_thread.cpp @@ -190,5 +190,5 @@ void TestWaylandConnectionThread::testConnectionDieing() QCOMPARE(connectedSpy.count(), 1); } -QTEST_MAIN(TestWaylandConnectionThread) +QTEST_GUILESS_MAIN(TestWaylandConnectionThread) #include "test_wayland_connection_thread.moc" diff --git a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp b/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp index 329b329973..56fbebb544 100644 --- a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp +++ b/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp @@ -142,5 +142,5 @@ void TestWaylandFullscreenShell::testRegistryCreate() QVERIFY(fullscreenShell->isValid()); } -QTEST_MAIN(TestWaylandFullscreenShell) +QTEST_GUILESS_MAIN(TestWaylandFullscreenShell) #include "test_wayland_fullscreen_shell.moc" diff --git a/src/wayland/autotests/client/test_wayland_output.cpp b/src/wayland/autotests/client/test_wayland_output.cpp index 4dd9b77d9b..b558c863bc 100644 --- a/src/wayland/autotests/client/test_wayland_output.cpp +++ b/src/wayland/autotests/client/test_wayland_output.cpp @@ -321,5 +321,5 @@ void TestWaylandOutput::testTransform() QCOMPARE(output->transform(), Output::Transform::Normal); } -QTEST_MAIN(TestWaylandOutput) +QTEST_GUILESS_MAIN(TestWaylandOutput) #include "test_wayland_output.moc" diff --git a/src/wayland/autotests/client/test_wayland_registry.cpp b/src/wayland/autotests/client/test_wayland_registry.cpp index 54aa9a5601..571be0f8a2 100644 --- a/src/wayland/autotests/client/test_wayland_registry.cpp +++ b/src/wayland/autotests/client/test_wayland_registry.cpp @@ -274,5 +274,5 @@ void TestWaylandRegistry::testDestroy() registry.destroy(); } -QTEST_MAIN(TestWaylandRegistry) +QTEST_GUILESS_MAIN(TestWaylandRegistry) #include "test_wayland_registry.moc" diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp index ced3a25d41..3163d3c129 100644 --- a/src/wayland/autotests/client/test_wayland_seat.cpp +++ b/src/wayland/autotests/client/test_wayland_seat.cpp @@ -565,5 +565,5 @@ void TestWaylandSeat::testDestroy() p->destroy(); } -QTEST_MAIN(TestWaylandSeat) +QTEST_GUILESS_MAIN(TestWaylandSeat) #include "test_wayland_seat.moc" diff --git a/src/wayland/autotests/client/test_wayland_shell.cpp b/src/wayland/autotests/client/test_wayland_shell.cpp index 2297bb4b42..813ceea126 100644 --- a/src/wayland/autotests/client/test_wayland_shell.cpp +++ b/src/wayland/autotests/client/test_wayland_shell.cpp @@ -354,5 +354,5 @@ void TestWaylandShell::testCast() QCOMPARE((wl_shell*)s2, wlShell); } -QTEST_MAIN(TestWaylandShell) +QTEST_GUILESS_MAIN(TestWaylandShell) #include "test_wayland_shell.moc" diff --git a/src/wayland/autotests/client/test_wayland_surface.cpp b/src/wayland/autotests/client/test_wayland_surface.cpp index e1eb3129fe..2be1b99c4b 100644 --- a/src/wayland/autotests/client/test_wayland_surface.cpp +++ b/src/wayland/autotests/client/test_wayland_surface.cpp @@ -367,5 +367,5 @@ void TestWaylandSurface::testDestroy() s->destroy(); } -QTEST_MAIN(TestWaylandSurface) +QTEST_GUILESS_MAIN(TestWaylandSurface) #include "test_wayland_surface.moc" diff --git a/src/wayland/autotests/server/test_display.cpp b/src/wayland/autotests/server/test_display.cpp index bc9aaf0e61..2c257c1f60 100644 --- a/src/wayland/autotests/server/test_display.cpp +++ b/src/wayland/autotests/server/test_display.cpp @@ -101,5 +101,5 @@ void TestWaylandServerDisplay::testAddRemoveOutput() QVERIFY(display.outputs().isEmpty()); } -QTEST_MAIN(TestWaylandServerDisplay) +QTEST_GUILESS_MAIN(TestWaylandServerDisplay) #include "test_display.moc" diff --git a/src/wayland/autotests/server/test_seat.cpp b/src/wayland/autotests/server/test_seat.cpp index 929523abe2..10e702a4b3 100644 --- a/src/wayland/autotests/server/test_seat.cpp +++ b/src/wayland/autotests/server/test_seat.cpp @@ -170,5 +170,5 @@ void TestWaylandServerSeat::testDestroyThroughTerminate() QVERIFY(!destroyedSpy.isEmpty()); } -QTEST_MAIN(TestWaylandServerSeat) +QTEST_GUILESS_MAIN(TestWaylandServerSeat) #include "test_seat.moc"