Drop InitDefaultLogFiles helper

Both the config and the server now default to these log file paths

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

19 files changed, 0 insertions, 46 deletions

diff --git a/tests/common/helpers.cpp b/tests/common/helpers.cpp
index 27e6c48..b6c5691 100644
--- a/tests/common/helpers.cpp
+++ b/tests/common/helpers.cpp
@@ -9,7 +9,6 @@
 #include <X11/extensions/Xrandr.h>
 
 void StartServer(std::string prefix, ::xorg::testing::XServer &server, XOrgConfig &config) {
-    InitDefaultLogFiles(server, &config);
     config.WriteConfig();
     server.SetDisplayNumber(133);
     server.Start();
@@ -157,10 +156,3 @@ std::string GetDefaultLogFile() {
 std::string GetDefaultConfigFile() {
     return std::string(LOG_BASE_PATH) + std::string("/") + GetNormalizedTestName() + std::string(".conf");
 }
-
-void InitDefaultLogFiles(xorg::testing::XServer &server, XOrgConfig *config) {
-    server.SetOption("-logfile", GetDefaultLogFile());
-    server.SetOption("-config", GetDefaultConfigFile());
-    if (config)
-        config->SetPath(server.GetConfigPath());
-}
diff --git a/tests/common/helpers.h b/tests/common/helpers.h
index 29a162c..a005716 100644
--- a/tests/common/helpers.h
+++ b/tests/common/helpers.h
@@ -84,15 +84,5 @@ std::string GetDefaultLogFile();
  */
 std::string GetDefaultConfigFile();
 
-/**
- * Init the server's log file and config file path to the default paths.
- * If a config has been specified, init that to the default config path. If
- * the config is NULL, the server is set to default config path nonetheless.
- *
- * @param [in] server The server to set the -logfile and -config options for
- * @param [in] config The config to set the path for. May be NULL.
- */
-void InitDefaultLogFiles(xorg::testing::XServer &server, XOrgConfig *config = NULL);
-
 #endif
 
diff --git a/tests/common/input-driver-test.h b/tests/common/input-driver-test.h
index 985a7b9..2bda0a1 100644
--- a/tests/common/input-driver-test.h
+++ b/tests/common/input-driver-test.h
@@ -47,7 +47,6 @@ class SimpleInputDriverTest : public InputDriverTest,
                               public ::testing::WithParamInterface<std::string> {
 public:
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         std::string driver = GetParam();
 
diff --git a/tests/common/video-driver-test.h b/tests/common/video-driver-test.h
index 05bc07f..2b78516 100644
--- a/tests/common/video-driver-test.h
+++ b/tests/common/video-driver-test.h
@@ -29,7 +29,6 @@ class SimpleVideoDriverTest : public VideoDriverTest,
                               public ::testing::WithParamInterface<std::string> {
 public:
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         std::string driver = GetParam();
 
diff --git a/tests/common/xit-server-test.cpp b/tests/common/xit-server-test.cpp
index 2846e10..9020e77 100644
--- a/tests/common/xit-server-test.cpp
+++ b/tests/common/xit-server-test.cpp
@@ -17,7 +17,6 @@ void XITServerTest::SetUpEventListener() {
 }
 
 void XITServerTest::SetUpConfigAndLog() {
-    InitDefaultLogFiles(server, &config);
 }
 
 void XITServerTest::SetUp() {
diff --git a/tests/input/evdev.cpp b/tests/input/evdev.cpp
index b9e2985..fe5012c 100644
--- a/tests/input/evdev.cpp
+++ b/tests/input/evdev.cpp
@@ -78,7 +78,6 @@ class EvdevXKBTest : public InputDriverTest,
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -174,7 +173,6 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -575,7 +573,6 @@ public:
                 ss << " ";
         }
 
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -622,7 +619,6 @@ public:
      * Option "ButtonMapping" based on the string provided by GetParam()
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -662,7 +658,6 @@ public:
      * Set up a config for a single evdev Floating device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
diff --git a/tests/input/kbd.cpp b/tests/input/kbd.cpp
index 467000f..0d375af 100644
--- a/tests/input/kbd.cpp
+++ b/tests/input/kbd.cpp
@@ -76,7 +76,6 @@ class KeyboardTest : public InputDriverTest,
      * The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         /* we don't use the dummy driver here, for some reason we won't get
          * key events with it */
diff --git a/tests/input/legacy-drivers.cpp b/tests/input/legacy-drivers.cpp
index 017e01e..974010d 100644
--- a/tests/input/legacy-drivers.cpp
+++ b/tests/input/legacy-drivers.cpp
@@ -73,7 +73,6 @@ public:
      * Initialize an xorg.conf with a single CorePointer void device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("void", "--device--", "Option \"CorePointer\" \"on\"\n");
@@ -138,7 +137,6 @@ TEST(AcecadTest, InputDeviceSectionWithOptionDevice)
 class AiptekTest : public InputDriverTest,
                    public ::testing::WithParamInterface<std::string> {
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         std::string type = GetParam();
 
diff --git a/tests/input/mouse.cpp b/tests/input/mouse.cpp
index 2bdbabf..cb074e8 100644
--- a/tests/input/mouse.cpp
+++ b/tests/input/mouse.cpp
@@ -39,7 +39,6 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("mouse", "--device--",
diff --git a/tests/input/synaptics.cpp b/tests/input/synaptics.cpp
index 4186a80..961f78a 100644
--- a/tests/input/synaptics.cpp
+++ b/tests/input/synaptics.cpp
@@ -43,7 +43,6 @@ public:
      * vertical scroll.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -146,7 +145,6 @@ class SynapticsSmoothScrollTest : public SynapticsTest,
      * vertical scroll.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         std::pair<int, int> params = GetParam();
 
@@ -398,7 +396,6 @@ public:
      * Set up a single clickpad CorePointer device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -706,7 +703,6 @@ public:
      * SoftButtonArea option set to 50% left/right, 82% from the top.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -772,7 +768,6 @@ public:
      * SoftButtonArea option set to 50% left/right, 82% from the top.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
diff --git a/tests/input/wacom-hovering-expresskeys.cpp b/tests/input/wacom-hovering-expresskeys.cpp
index fff7619..3fa6628 100644
--- a/tests/input/wacom-hovering-expresskeys.cpp
+++ b/tests/input/wacom-hovering-expresskeys.cpp
@@ -53,7 +53,6 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
         server.SetOption("-retro", "");
 
         config.AddDefaultScreenWithDriver();
diff --git a/tests/input/wacom-input-matrix.cpp b/tests/input/wacom-input-matrix.cpp
index b4307bd..d004b65 100644
--- a/tests/input/wacom-input-matrix.cpp
+++ b/tests/input/wacom-input-matrix.cpp
@@ -58,7 +58,6 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("wacom", "Stylus",
diff --git a/tests/input/wacom.cpp b/tests/input/wacom.cpp
index b722680..60efb65 100644
--- a/tests/input/wacom.cpp
+++ b/tests/input/wacom.cpp
@@ -47,7 +47,6 @@ protected:
      * dummy video driver.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.SetAutoAddDevices(true);
diff --git a/tests/lib/libXi.cpp b/tests/lib/libXi.cpp
index 5ffbc95..c4de0d9 100644
--- a/tests/lib/libXi.cpp
+++ b/tests/lib/libXi.cpp
@@ -34,7 +34,6 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp
index e890ddd..0f05901 100644
--- a/tests/server/grab.cpp
+++ b/tests/server/grab.cpp
@@ -34,7 +34,6 @@ public:
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -172,7 +171,6 @@ public:
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
                                "Option \"CorePointer\" \"on\"\n"
diff --git a/tests/server/misc.cpp b/tests/server/misc.cpp
index 4d0fd74..7ccb7e7 100644
--- a/tests/server/misc.cpp
+++ b/tests/server/misc.cpp
@@ -28,7 +28,6 @@ public:
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
                                "Option \"CorePointer\" \"on\"\n"
@@ -68,7 +67,6 @@ TEST(MiscServerTest, DoubleSegfault)
                   "signal, clean up and then call abort().\n");
 
     XITServer server;
-    InitDefaultLogFiles(server);
     server.Start();
 
     ASSERT_EQ(server.GetState(), xorg::testing::Process::RUNNING);
diff --git a/tests/server/multihead.cpp b/tests/server/multihead.cpp
index 9752f61..cc3549f 100644
--- a/tests/server/multihead.cpp
+++ b/tests/server/multihead.cpp
@@ -25,7 +25,6 @@ class ZaphodTest : public Test,
 public:
     virtual void SetUp() {
         SetDevice("mice/PIXART-USB-OPTICAL-MOUSE.desc");
-        InitDefaultLogFiles(server);
         config_path = server.GetConfigPath();
 
         bool left_of = GetParam();
diff --git a/tests/server/xi2.cpp b/tests/server/xi2.cpp
index dcb00fd..4df58fc 100644
--- a/tests/server/xi2.cpp
+++ b/tests/server/xi2.cpp
@@ -24,7 +24,6 @@ protected:
     }
 
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
         config.AddDefaultScreenWithDriver();
         config.SetAutoAddDevices(true);
         config.WriteConfig();
diff --git a/tests/server/xigrabbutton.cpp b/tests/server/xigrabbutton.cpp
index 017d08b..8c88b2b 100644
--- a/tests/server/xigrabbutton.cpp
+++ b/tests/server/xigrabbutton.cpp
@@ -28,7 +28,6 @@ public:
     /**
      */
     virtual void SetUpConfigAndLog() {
-        InitDefaultLogFiles(server, &config);
 
         config.SetAutoAddDevices(false);
         config.AddDefaultScreenWithDriver();