Drop StartServer() helper function

This functionality is now provided by XITServer::Start(config);

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

6 files changed, 7 insertions, 16 deletions

diff --git a/tests/common/helpers.cpp b/tests/common/helpers.cpp
index 0a66165..18f4f7c 100644
--- a/tests/common/helpers.cpp
+++ b/tests/common/helpers.cpp
@@ -8,10 +8,6 @@
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
 
-void StartServer(std::string prefix, XITServer &server, XOrgConfig &config) {
-    server.Start(config);
-}
-
 int FindInputDeviceByName(Display *dpy, const std::string &device_name, int *deviceid)
 {
     int ndevices;
diff --git a/tests/common/helpers.h b/tests/common/helpers.h
index 9c176f2..ed7d43e 100644
--- a/tests/common/helpers.h
+++ b/tests/common/helpers.h
@@ -11,11 +11,6 @@
 #include "xit-server.h"
 
 /**
- * Start the server after writing the config, with the prefix given.
- */
-void StartServer(std::string prefix, XITServer &server, XOrgConfig &config);
-
-/**
  * Find the device in the input device list and return the number of
  * instances found.
  *
diff --git a/tests/input/legacy-drivers.cpp b/tests/input/legacy-drivers.cpp
index 974010d..8f12869 100644
--- a/tests/input/legacy-drivers.cpp
+++ b/tests/input/legacy-drivers.cpp
@@ -101,7 +101,7 @@ TEST(AcecadTest, InputDeviceSectionWithOptionDevice)
                            "Option \"CorePointer\" \"on\"\n"
                            "Option \"Device\" \"/dev/input/event0\"\n");
     config.AddDefaultScreenWithDriver();
-    StartServer("acecad-type-stylus", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     int major = 2;
@@ -184,7 +184,7 @@ TEST(ElographicsTest, InputDeviceSectionWithOptionDevice)
                            "Option \"CorePointer\" \"on\"\n"
                            "Option \"Device\" \"/dev/input/event0\"\n");
     config.AddDefaultScreenWithDriver();
-    StartServer("elographics", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     int major = 2;
@@ -329,7 +329,7 @@ TEST(ElographicsTest, StylusMovement)
     }
 
     /* parent */
-    StartServer("elographics", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     int major = 2;
diff --git a/tests/input/synaptics.cpp b/tests/input/synaptics.cpp
index 961f78a..dc33402 100644
--- a/tests/input/synaptics.cpp
+++ b/tests/input/synaptics.cpp
@@ -902,7 +902,7 @@ TEST(SynapticsClickPad, HotPlugSoftButtons)
 
     config.SetAutoAddDevices(true);
     config.AddDefaultScreenWithDriver();
-    StartServer("synaptics-clickpad-softbuttons", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     int major = 2;
diff --git a/tests/input/wacom.cpp b/tests/input/wacom.cpp
index 60efb65..c741ba7 100644
--- a/tests/input/wacom.cpp
+++ b/tests/input/wacom.cpp
@@ -441,7 +441,7 @@ TEST(WacomDriver, PrivToolDoubleFree)
                            );
     config.AddDefaultScreenWithDriver();
 
-    EXPECT_NO_THROW(StartServer("wacom-double-free", server, config));
+    EXPECT_NO_THROW(server.Start(config));
 }
 
 class WacomLensCursorTest : public WacomDriverTest
diff --git a/tests/server/xtest.cpp b/tests/server/xtest.cpp
index 4e47c8b..c6a96a9 100644
--- a/tests/server/xtest.cpp
+++ b/tests/server/xtest.cpp
@@ -49,7 +49,7 @@ TEST(XTest, DisabledDevicesProperty)
     XITServer server;
     XOrgConfig config;
     config.AddDefaultScreenWithDriver();
-    StartServer("xtest-disable-properties", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     ASSERT_TRUE(dpy);
@@ -120,7 +120,7 @@ TEST(XTest, DisabledDevicesCtl)
     XITServer server;
     XOrgConfig config;
     config.AddDefaultScreenWithDriver();
-    StartServer("xtest-disable-devctl", server, config);
+    server.Start(config);
 
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
     ASSERT_TRUE(dpy);