test: move device creation into a shared function

remove some of that code duplication in the tests.

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

diff --git a/test/Makefile.am b/test/Makefile.am
index e151bff273013aee9285550e18b6055fcbe646ea..e2c1ca117f81b79d2e9278e8c8ff8127cab07b75 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,7 +6,11 @@ libevdev_sources = $(top_srcdir)/libevdev/libevdev.c \
                   $(top_srcdir)/libevdev/libevdev.h \
                   $(top_srcdir)/libevdev/libevdev-util.h \
                   $(top_srcdir)/libevdev/libevdev-int.h
-common_sources = $(libevdev_sources) test-common-uinput.c test-common-uinput.h test-common.h
+common_sources = $(libevdev_sources) \
+                test-common-uinput.c \
+                test-common-uinput.h \
+                test-common.c \
+                test-common.h
 
 # include builddir for event-names.h
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/libevdev $(CHECK_CFLAGS) $(GCOV_CFLAGS)

diff --git a/test/test-common.c b/test/test-common.c
new file mode 100644 (file)
index 0000000..4db852d
--- /dev/null
+++ b/test/test-common.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <check.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include "test-common.h"
+
+int test_create_device(struct uinput_device **uidev_return,
+                      struct libevdev **dev_return,
+                      ...)
+{
+       int rc, fd;
+       struct uinput_device *uidev;
+       struct libevdev *dev;
+       va_list args;
+
+       va_start(args, dev_return);
+
+       rc = uinput_device_new_with_events_v(&uidev, "test device", DEFAULT_IDS, args);
+       va_end(args);
+
+       ck_assert_msg(rc == 0, "Failed to create uinput device: %s", strerror(-rc));
+
+       fd = uinput_device_get_fd(uidev);
+
+       rc = libevdev_new_from_fd(fd, &dev);
+       ck_assert_msg(rc == 0, "Failed to init device device: %s", strerror(-rc));
+       rc = fcntl(fd, F_SETFL, O_NONBLOCK);
+       ck_assert_msg(rc == 0, "fcntl failed: %s", strerror(errno));
+
+       *uidev_return = uidev;
+       *dev_return = dev;
+
+       return rc == 0 ? rc : -errno;
+}
+

diff --git a/test/test-common.h b/test/test-common.h
index 79715f12a9a1a77ff4302345aeee5e0658256427..e54591246d4bb423950966a54438800d76e1531f 100644 (file)
--- a/test/test-common.h
+++ b/test/test-common.h
@@ -31,4 +31,8 @@
 #include "test-common-uinput.h"
 
 
+int test_create_device(struct uinput_device **uidev,
+                      struct libevdev **dev,
+                      ...);
+
 #endif /* _TEST_COMMON_H_ */