diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-11 17:03:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-13 15:12:43 +1000 |
| commit | 6e70a73efd96a53305b1b6cf2d753861ec9ab8ef (patch) | |
| tree | 8264baaad8affe71b1c6cb4562cbb6885966550b /tests/server | |
| parent | 6904377ee61c1a5ca4c2c944c607bb1bc4d917b7 (diff) | |
server/barriers: move evemu device setup to separate function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'tests/server')
| -rw-r--r-- | tests/server/barriers-common.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/server/barriers-common.h b/tests/server/barriers-common.h index 383a8b5..47accb9 100644 --- a/tests/server/barriers-common.h +++ b/tests/server/barriers-common.h @@ -65,6 +65,12 @@ public: int master_id_2; virtual void SetUp() { + SetUpDevices(); + XITServerInputTest::SetUp(); + ConfigureDevices(); + } + + virtual void SetUpDevices() { dev1 = std::auto_ptr<xorg::testing::evemu::Device>( new xorg::testing::evemu::Device( RECORDINGS_DIR "mice/PIXART-USB-OPTICAL-MOUSE-HWHEEL.desc" @@ -73,8 +79,6 @@ public: new xorg::testing::evemu::Device( RECORDINGS_DIR "mice/PIXART-USB-OPTICAL-MOUSE-HWHEEL.desc" )); - XITServerInputTest::SetUp(); - ConfigureDevices(); } void ConfigureDevices() { |