Commit 16c84cdd819db516fff089c76b99248fb7dd4e8c
2018-08-20T15:50:35
test: drop the rmlvo ability from print-compiled-keymap This is now handled by the rmlvo-to-keymap tool Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
diff --git a/test/print-compiled-keymap.c b/test/print-compiled-keymap.c
index 7e57fdd..6829eac 100644
--- a/test/print-compiled-keymap.c
+++ b/test/print-compiled-keymap.c
@@ -32,56 +32,32 @@ main(int argc, char *argv[])
int opt;
struct xkb_context *ctx;
struct xkb_keymap *keymap;
- const char *rules = NULL;
- const char *model = NULL;
- const char *layout = NULL;
- const char *variant = NULL;
- const char *options = NULL;
const char *keymap_path = NULL;
char *dump;
- while ((opt = getopt(argc, argv, "r:m:l:v:o:k:h")) != -1) {
+ while ((opt = getopt(argc, argv, "h")) != -1) {
switch (opt) {
- case 'r':
- rules = optarg;
- break;
- case 'm':
- model = optarg;
- break;
- case 'l':
- layout = optarg;
- break;
- case 'v':
- variant = optarg;
- break;
- case 'o':
- options = optarg;
- break;
- case 'k':
- keymap_path = optarg;
- break;
case 'h':
case '?':
- fprintf(stderr, "Usage: %s [-r <rules>] [-m <model>] "
- "[-l <layout>] [-v <variant>] [-o <options>]\n",
- argv[0]);
- fprintf(stderr, " or: %s -k <path to keymap file>\n",
- argv[0]);
+ fprintf(stderr, "Usage: %s <path to keymap file>\n", argv[0]);
exit(EXIT_FAILURE);
}
}
+ if (optind >= argc) {
+ fprintf(stderr, "Error: missing path to keymap file\n");
+ exit(EXIT_FAILURE);
+ }
+
+ keymap_path = argv[optind];
+
ctx = test_get_context(0);
if (!ctx) {
fprintf(stderr, "Couldn't create xkb context\n");
goto err_out;
}
- if (keymap_path)
- keymap = test_compile_file(ctx, keymap_path);
- else
- keymap = test_compile_rules(ctx, rules, model, layout, variant,
- options);
+ keymap = test_compile_file(ctx, keymap_path);
if (!keymap) {
fprintf(stderr, "Couldn't create xkb keymap\n");
goto err_ctx;