[PATCH 1/2] server/xi2: Fix N-Trig-MultiTouch file access

Daniel Drake dsd at laptop.org
Mon Oct 1 13:45:50 PDT 2012


These tests were failing because the filenames were wrong.
---
 tests/server/xi2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/server/xi2.cpp b/tests/server/xi2.cpp
index 9fd7713..c1ec943 100644
--- a/tests/server/xi2.cpp
+++ b/tests/server/xi2.cpp
@@ -65,7 +65,7 @@ TEST_P(XInput2Test, XIQueryPointerTouchscreen)
     try {
       device = std::auto_ptr<xorg::testing::evemu::Device>(
           new xorg::testing::evemu::Device(
-              RECORDINGS_DIR "tablets/N-Trig MultiTouch.device")
+              RECORDINGS_DIR "tablets/N-Trig-MultiTouch.desc")
           );
     } catch (std::runtime_error &error) {
       std::cerr << "Failed to create evemu device, skipping test.\n";
@@ -74,7 +74,7 @@ TEST_P(XInput2Test, XIQueryPointerTouchscreen)
 
     ASSERT_TRUE(xorg::testing::XServer::WaitForDevice(Display(), "N-Trig MultiTouch"));
 
-    device->Play(RECORDINGS_DIR "tablets/N-Trig MultiTouch.touch_1_begin.events");
+    device->Play(RECORDINGS_DIR "tablets/N-Trig-MultiTouch.touch_1_begin.events");
 
     ASSERT_TRUE(xorg::testing::XServer::WaitForEventOfType(Display(),
                                                            GenericEvent,
@@ -151,7 +151,7 @@ TEST_P(XInput2Test, DisableDeviceEndTouches)
     try {
       device = std::auto_ptr<xorg::testing::evemu::Device>(
           new xorg::testing::evemu::Device(
-              RECORDINGS_DIR "tablets/N-Trig MultiTouch.device")
+              RECORDINGS_DIR "tablets/N-Trig-MultiTouch.desc")
           );
     } catch (std::runtime_error &error) {
       std::cerr << "Failed to create evemu device, skipping test.\n";
@@ -160,7 +160,7 @@ TEST_P(XInput2Test, DisableDeviceEndTouches)
 
     ASSERT_TRUE(xorg::testing::XServer::WaitForDevice(Display(), "N-Trig MultiTouch"));
 
-    device->Play(RECORDINGS_DIR "tablets/N-Trig MultiTouch.touch_1_begin.events");
+    device->Play(RECORDINGS_DIR "tablets/N-Trig-MultiTouch.touch_1_begin.events");
 
     ASSERT_TRUE(xorg::testing::XServer::WaitForEventOfType(Display(),
                                                            GenericEvent,
-- 
1.7.11.4



More information about the xorg-devel mailing list