test/input: use new default log files for all tests

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

7 files changed, 31 insertions, 49 deletions

diff --git a/tests/input/evdev.cpp b/tests/input/evdev.cpp
index 5377355..16f2ee3 100644
--- a/tests/input/evdev.cpp
+++ b/tests/input/evdev.cpp
@@ -78,8 +78,7 @@ class EvdevDriverXKBTest : public InputDriverTest,
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-evdev-driver-xkb.log");
-        server.SetOption("-config", "/tmp/evdev-driver-xkb.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -91,7 +90,7 @@ class EvdevDriverXKBTest : public InputDriverTest,
         /* add default mouse device to avoid server adding our device again */
         config.AddInputSection("mouse", "mouse-device",
                                "Option \"CorePointer\" \"on\"\n");
-        config.WriteConfig("/tmp/evdev-driver-xkb.conf");
+        config.WriteConfig();
     }
 
     protected:
@@ -175,8 +174,7 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-evdev-driver-mouse.log");
-        server.SetOption("-config", "/tmp/evdev-driver-mouse.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
@@ -185,7 +183,7 @@ public:
         /* add default keyboard device to avoid server adding our device again */
         config.AddInputSection("kbd", "keyboard-device",
                                "Option \"CoreKeyboard\" \"on\"\n");
-        config.WriteConfig("/tmp/evdev-driver-mouse.conf");
+        config.WriteConfig();
     }
 
     virtual int RegisterXI2(int major, int minor)
@@ -577,15 +575,14 @@ public:
                 ss << " ";
         }
 
-        server.SetOption("-logfile", "/tmp/Xorg-evdev-driver-buttonmapping.log");
-        server.SetOption("-config", "/tmp/evdev-driver-buttonmapping.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
                                "Option \"CorePointer\" \"on\"\n"
                                "Option \"Device\" \"" + dev->GetDeviceNode() + "\""
                                "Option \"ButtonMapping\" \"" + ss.str() + "\"");
-        config.WriteConfig("/tmp/evdev-driver-buttonmapping.conf");
+        config.WriteConfig();
     }
 };
 
@@ -625,16 +622,14 @@ public:
      * Option "ButtonMapping" based on the string provided by GetParam()
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        std::string log_file = "/tmp/Xorg-evdev-driver-buttonmapping-invalid.log";
-        server.SetOption("-logfile", log_file);
-        server.SetOption("-config", "/tmp/evdev-driver-buttonmapping-invalid.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
                                "Option \"CorePointer\" \"on\"\n"
                                "Option \"Device\" \"" + dev->GetDeviceNode() + "\""
                                "Option \"ButtonMapping\" \"" + GetParam() + "\"");
-        config.WriteConfig("/tmp/evdev-driver-buttonmapping-invalid.conf");
+        config.WriteConfig();
     }
 };
 
@@ -667,15 +662,13 @@ public:
      * Set up a config for a single evdev Floating device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        std::string log_file = "/tmp/Xorg-evdev-driver-floating.log";
-        server.SetOption("-logfile", log_file);
-        server.SetOption("-config", "/tmp/evdev-driver-floating.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("evdev", "--device--",
                                "Option \"Floating\" \"on\"\n"
                                "Option \"Device\" \"" + dev->GetDeviceNode() + "\"");
-        config.WriteConfig("/tmp/evdev-driver-floating.conf");
+        config.WriteConfig();
     }
 };
 
diff --git a/tests/input/kbd.cpp b/tests/input/kbd.cpp
index fc0937a..70290be 100644
--- a/tests/input/kbd.cpp
+++ b/tests/input/kbd.cpp
@@ -16,6 +16,7 @@
 
 #include "input-driver-test.h"
 #include "device-interface.h"
+#include "helpers.h"
 
 typedef std::pair <int, KeySym> Key_Pair;
 typedef std::multimap<std::string, Key_Pair> Keys_Map;
@@ -75,8 +76,7 @@ class KeyboardDriverTest : public InputDriverTest,
      * The input from GetParam() is used as XkbLayout.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-kbd-driver.log");
-        server.SetOption("-config", "/tmp/kbd-driver.conf");
+        InitDefaultLogFiles(server, &config);
 
         /* we don't use the dummy driver here, for some reason we won't get
          * key events with it */
@@ -85,7 +85,7 @@ class KeyboardDriverTest : public InputDriverTest,
                                "Option \"XkbRules\"   \"xorg\"\n"
                                "Option \"XkbModel\"   \"dellusbmm\"\n"
                                "Option \"XkbLayout\"  \""+ GetParam() + "\"\n");
-        config.WriteConfig("/tmp/kbd-driver.conf");
+        config.WriteConfig();
     }
 
     protected:
diff --git a/tests/input/mouse.cpp b/tests/input/mouse.cpp
index e91cc74..0160a52 100644
--- a/tests/input/mouse.cpp
+++ b/tests/input/mouse.cpp
@@ -39,15 +39,14 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-mouse-driver.log");
-        server.SetOption("-config", "/tmp/mouse-driver.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("mouse", "--device--",
                                "Option \"ZAxisMapping\" \"4 5 6 7\"\n"
                                "Option \"Protocol\" \"ImPS/2\"\n"
                                "Option \"CorePointer\" \"on\"\n");
-        config.WriteConfig("/tmp/mouse-driver.conf");
+        config.WriteConfig();
     }
 };
 
diff --git a/tests/input/synaptics.cpp b/tests/input/synaptics.cpp
index 4eb9f25..5f4a920 100644
--- a/tests/input/synaptics.cpp
+++ b/tests/input/synaptics.cpp
@@ -43,8 +43,7 @@ public:
      * vertical scroll.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-synaptics-driver-SynPS2.log");
-        server.SetOption("-config", "/tmp/synaptics-SynPS2.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -55,7 +54,7 @@ public:
                                "Option \"FastTaps\"            \"1\"\n"
                                "Option \"VertTwoFingerScroll\" \"1\"\n"
                                "Option \"Device\"              \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig("/tmp/synaptics-SynPS2.conf");
+        config.WriteConfig();
     }
 
     virtual int RegisterXI2(int major, int minor)
@@ -147,8 +146,7 @@ class SynapticsDriverSmoothScrollTest : public SynapticsDriverTest,
      * vertical scroll.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-synaptics-driver-smooth-scrolling.log");
-        server.SetOption("-config", "/tmp/synaptics-smooth-scrolling.conf");
+        InitDefaultLogFiles(server, &config);
 
         std::pair<int, int> params = GetParam();
 
@@ -167,7 +165,7 @@ class SynapticsDriverSmoothScrollTest : public SynapticsDriverTest,
                                "Option \"VertScrollDelta\" \"" + vdelta + "\"\n"
                                "Option \"HorizScrollDelta\" \"" + hdelta + "\"\n"
                                "Option \"Device\"              \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig("/tmp/synaptics-smooth-scrolling.conf");
+        config.WriteConfig();
     }
 
 };
@@ -400,8 +398,7 @@ public:
      * Set up a single clickpad CorePointer device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-synaptics-driver-clickpad.log");
-        server.SetOption("-config", "/tmp/synaptics-clickpad.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -410,7 +407,7 @@ public:
                                "Option \"GrabEventDevice\"     \"0\"\n"
                                "Option \"VertTwoFingerScroll\" \"1\"\n"
                                "Option \"Device\"              \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig("/tmp/synaptics-clickpad.conf");
+        config.WriteConfig();
     }
 };
 
@@ -709,8 +706,7 @@ public:
      * SoftButtonArea option set to 50% left/right, 82% from the top.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-synaptics-driver-clickpad-softbuttons.log");
-        server.SetOption("-config", "/tmp/synaptics-clickpad-softbuttons.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -719,7 +715,7 @@ public:
                                "Option \"GrabEventDevice\"     \"0\"\n"
                                "Option \"SoftButtonAreas\"     \"50% 0 82% 0 0 0 0 0\"\n"
                                "Option \"Device\"              \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig("/tmp/synaptics-clickpad-softbuttons.conf");
+        config.WriteConfig();
     }
 };
 
@@ -776,8 +772,7 @@ public:
      * SoftButtonArea option set to 50% left/right, 82% from the top.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-synaptics-driver-clickpad-softbuttons.log");
-        server.SetOption("-config", "/tmp/synaptics-clickpad-softbuttons.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("synaptics", "--device--",
@@ -785,7 +780,7 @@ public:
                                "Option \"ClickPad\"            \"off\"\n"
                                "Option \"GrabEventDevice\"     \"0\"\n"
                                "Option \"Device\"              \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig(server.GetConfigPath());
+        config.WriteConfig();
     }
 };
 
diff --git a/tests/input/wacom-hovering-expresskeys.cpp b/tests/input/wacom-hovering-expresskeys.cpp
index cd87096..6a253d6 100644
--- a/tests/input/wacom-hovering-expresskeys.cpp
+++ b/tests/input/wacom-hovering-expresskeys.cpp
@@ -53,8 +53,7 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-wacom-hovering-test.log");
-        server.SetOption("-config", "/tmp/wacom-hovering-test.conf");
+        InitDefaultLogFiles(server, &config);
         server.SetOption("-retro", "");
 
         config.AddDefaultScreenWithDriver();
@@ -72,7 +71,7 @@ public:
         config.AddInputSection("wacom", "Eraser",
                                "Option \"Type\"        \"eraser\"\n"
                                "Option \"Device\"      \"" + dev->GetDeviceNode() + "\"\n");
-        config.WriteConfig("/tmp/wacom-hovering-test.conf");
+        config.WriteConfig();
     }
 };
 
diff --git a/tests/input/wacom-input-matrix.cpp b/tests/input/wacom-input-matrix.cpp
index 7641879..1f1fe49 100644
--- a/tests/input/wacom-input-matrix.cpp
+++ b/tests/input/wacom-input-matrix.cpp
@@ -58,8 +58,7 @@ public:
      * the evemu device.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        server.SetOption("-logfile", "/tmp/Xorg-wacom-matrix-test.log");
-        server.SetOption("-config", "/tmp/wacom-matrix-test.conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection("wacom", "Stylus",
@@ -67,7 +66,7 @@ public:
                                "Option \"Type\"        \"stylus\"\n"
                                "Option \"Device\"      \"" + dev->GetDeviceNode() + "\"\n");
 
-        config.WriteConfig("/tmp/wacom-matrix-test.conf");
+        config.WriteConfig();
     }
 protected:
     int xrandr_event, xrandr_error;
diff --git a/tests/input/wacom.cpp b/tests/input/wacom.cpp
index 2c1b3fc..3251999 100644
--- a/tests/input/wacom.cpp
+++ b/tests/input/wacom.cpp
@@ -47,14 +47,11 @@ protected:
      * dummy video driver.
      */
     virtual void SetUpConfigAndLog(const std::string &param) {
-        Tablet tablet = GetParam();
-
-        server.SetOption("-logfile", "/tmp/Xorg-wacom-" + std::string(tablet.test_id) + ".log");
-        server.SetOption("-config", "/tmp/wacom-test-" + std::string(tablet.test_id) + ".conf");
+        InitDefaultLogFiles(server, &config);
 
         config.AddDefaultScreenWithDriver();
         config.SetAutoAddDevices(true);
-        config.WriteConfig(server.GetConfigPath());
+        config.WriteConfig();
     }
 
     /**