tests: fix build with new uterm headers

These tests still use uterm.h which builds fine if you have an old uterm
version installed, however, with a new version this will fail horribly.
Hence, fix them to use the new headers.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

diff --git a/tests/test_input.c b/tests/test_input.c
index 9fcd040..495c70e 100644 (file)
--- a/tests/test_input.c
+++ b/tests/test_input.c
@@ -40,7 +40,8 @@ static void print_help();
 #include <xkbcommon/xkbcommon.h>
 #include "eloop.h"
 #include "log.h"
-#include "uterm.h"
+#include "uterm_input.h"
+#include "uterm_monitor.h"
 #include "test_include.h"
 
 static struct ev_eloop *eloop;

diff --git a/tests/test_output.c b/tests/test_output.c
index a127d92..b087886 100644 (file)
--- a/tests/test_output.c
+++ b/tests/test_output.c
@@ -48,7 +48,7 @@ static void print_help();
 
 #include "eloop.h"
 #include "log.h"
-#include "uterm.h"
+#include "uterm_video.h"
 #include "test_include.h"
 
 /* eloop object */
@@ -193,8 +193,8 @@ int main(int argc, char **argv)
 {
        struct uterm_video *video;
        int ret;
-       unsigned int mode;
        const char *node;
+       const struct uterm_video_module *mode;
        size_t onum;
 
        onum = sizeof(options) / sizeof(*options);
@@ -215,12 +215,12 @@ int main(int argc, char **argv)
 
        log_notice("Creating video object using %s...", node);
 
-       ret = uterm_video_new(&video, eloop, mode, node);
+       ret = uterm_video_new(&video, eloop, node, mode);
        if (ret) {
                if (mode == UTERM_VIDEO_DRM) {
                        log_notice("cannot create drm device; trying dumb drm mode");
-                       ret = uterm_video_new(&video, eloop,
-                                             UTERM_VIDEO_DUMB, node);
+                       ret = uterm_video_new(&video, eloop, node,
+                                             UTERM_VIDEO_DUMB);
                        if (ret)
                                goto err_exit;
                } else {

diff --git a/tests/test_vt.c b/tests/test_vt.c
index 25ffe5e..c8f6c72 100644 (file)
--- a/tests/test_vt.c
+++ b/tests/test_vt.c
@@ -44,7 +44,8 @@ static void print_help();
 #include <unistd.h>
 #include "eloop.h"
 #include "log.h"
-#include "uterm.h"
+#include "uterm_input.h"
+#include "uterm_vt.h"
 #include "test_include.h"
 
 static void print_help()