norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix build with new uterm headers

Browse Source 
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>
This commit is contained in:
David Herrmann 2013-01-12 13:40:00 +01:00
parent bf39cf80b0
commit 5f348ccec7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_input.c
View File

@ -40,7 +40,8 @@ static void print_help();
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "eloop.h" #include "eloop.h"
#include "log.h" #include "log.h"
#include "uterm.h" #include "uterm_input.h"
#include "uterm_monitor.h"
#include "test_include.h" #include "test_include.h"
static struct ev_eloop *eloop; static struct ev_eloop *eloop;

10
tests/test_output.c
View File

@ -48,7 +48,7 @@ static void print_help();
#include "eloop.h" #include "eloop.h"
#include "log.h" #include "log.h"
#include "uterm.h" #include "uterm_video.h"
#include "test_include.h" #include "test_include.h"
/* eloop object */ /* eloop object */
@ -193,8 +193,8 @@ int main(int argc, char **argv)
{ {
struct uterm_video *video; struct uterm_video *video;
int ret; int ret;
unsigned int mode;
const char *node; const char *node;
const struct uterm_video_module *mode;
size_t onum; size_t onum;
onum = sizeof(options) / sizeof(*options); onum = sizeof(options) / sizeof(*options);
@ -215,12 +215,12 @@ int main(int argc, char **argv)
log_notice("Creating video object using %s...", node); 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 (ret) {
if (mode == UTERM_VIDEO_DRM) { if (mode == UTERM_VIDEO_DRM) {
log_notice("cannot create drm device; trying dumb drm mode"); log_notice("cannot create drm device; trying dumb drm mode");
ret = uterm_video_new(&video, eloop, ret = uterm_video_new(&video, eloop, node,
UTERM_VIDEO_DUMB, node); UTERM_VIDEO_DUMB);
if (ret) if (ret)
goto err_exit; goto err_exit;
} else { } else {

3
tests/test_vt.c
View File

@ -44,7 +44,8 @@ static void print_help();
#include <unistd.h> #include <unistd.h>
#include "eloop.h" #include "eloop.h"
#include "log.h" #include "log.h"
#include "uterm.h" #include "uterm_input.h"
#include "uterm_vt.h"
#include "test_include.h" #include "test_include.h"
static void print_help() static void print_help()