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

test_vt: use new test_include.h code

Browse Source 
test_vt now compiles again and uses the new infrastructure.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-04-22 16:51:28 +02:00
parent a34a107723
commit 1081c76274
1 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tests/test_vt.c
View File

@ -1,7 +1,7 @@
/* /*
* test_console - Test VT Layer * test_console - Test VT Layer
* *
* Copyright (c) 2011 David Herrmann <dh.herrmann@googlemail.com> * Copyright (c) 2011-2012 David Herrmann <dh.herrmann@googlemail.com>
* Copyright (c) 2011 University of Tuebingen * Copyright (c) 2011 University of Tuebingen
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
@ -29,7 +29,7 @@
* This opens a new VT and prints some text on it. You can then change the VT * This opens a new VT and prints some text on it. You can then change the VT
* and change back. This is only to test the VT subsystem and event engine. * and change back. This is only to test the VT subsystem and event engine.
* This automatically switches to the new VT. Currently, the display gets * This automatically switches to the new VT. Currently, the display gets
* freezed then because we aren't painting to the framebuffer yet. Use * frozen because we aren't painting to the framebuffer yet. Use
* ctrl+alt+FX (or some equivalent) to switch back to X/VT. * ctrl+alt+FX (or some equivalent) to switch back to X/VT.
*/ */
@ -43,70 +43,44 @@
#include "eloop.h" #include "eloop.h"
#include "log.h" #include "log.h"
#include "vt.h" #include "vt.h"
#include "test_include.h"
static bool terminate;
static void sig_term(struct ev_signal *sig, int signum, void *data)
{
terminate = true;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int ret; int ret;
struct ev_eloop *loop; struct ev_eloop *eloop;
struct kmscon_vt *vt; struct kmscon_vt *vt;
struct ev_signal *sig;
ret = ev_eloop_new(&loop); ret = test_prepare(argc, argv, &eloop);
if (ret) { if (ret)
log_err("Cannot create eloop\n"); goto err_fail;
goto err_out;
}
ret = ev_eloop_new_signal(loop, &sig, SIGINT, sig_term, NULL);
if (ret) {
log_err("Cannot add signal\n");
goto err_loop;
}
ret = kmscon_vt_new(&vt, NULL, NULL); ret = kmscon_vt_new(&vt, NULL, NULL);
if (ret) { if (ret)
log_err("Cannot create vt\n"); goto err_exit;
goto err_sig;
}
ret = kmscon_vt_open(vt, KMSCON_VT_NEW, loop); ret = kmscon_vt_open(vt, KMSCON_VT_NEW, eloop);
if (ret) { if (ret)
log_err("Cannot open VT\n");
goto err_vt; goto err_vt;
}
ret = kmscon_vt_enter(vt); ret = kmscon_vt_enter(vt);
if (ret) if (ret)
log_warn("Cannot switch to VT\n"); log_warn("Cannot switch to VT");
while (!terminate) { ev_eloop_run(eloop, -1);
ret = ev_eloop_dispatch(loop, -1);
if (ret) {
log_err("Dispatcher failed\n");
break;
}
}
log_debug("Terminating\n"); log_debug("Terminating\n");
/* switch back to previous VT but wait for eloop to process SIGUSR0 */ /* switch back to previous VT but wait for eloop to process SIGUSR0 */
ret = kmscon_vt_leave(vt); ret = kmscon_vt_leave(vt);
if (ret == -EINPROGRESS) if (ret == -EINPROGRESS)
ev_eloop_dispatch(loop, 1000); ev_eloop_run(eloop, 50);
err_vt: err_vt:
kmscon_vt_unref(vt); kmscon_vt_unref(vt);
err_sig: err_exit:
ev_eloop_rm_signal(sig); test_exit(eloop);
err_loop: err_fail:
ev_eloop_unref(loop); test_fail(ret);
err_out:
return abs(ret); return abs(ret);
} }