filecomp: fix path and error message Signed-off-by: Ran Benita <ran234@gmail.com>
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
diff --git a/src/text.c b/src/text.c
index 5286ba9..1e388ba 100644
--- a/src/text.c
+++ b/src/text.c
@@ -217,17 +217,17 @@ FileTypeText(enum xkb_file_type type)
{
switch (type) {
case FILE_TYPE_KEYMAP:
- return "Keymap";
+ return "xkb_keymap";
case FILE_TYPE_TYPES:
- return "Types";
+ return "xkb_types";
case FILE_TYPE_COMPAT:
- return "CompatMap";
+ return "xkb_compatability";
case FILE_TYPE_SYMBOLS:
- return "Symbols";
+ return "xkb_symbols";
case FILE_TYPE_KEYCODES:
- return "KeyNames";
+ return "xkb_keycodes";
case FILE_TYPE_RULES:
- return "Rules";
+ return "rules";
default:
return "unknown";
}
diff --git a/test/filecomp.c b/test/filecomp.c
index 0297897..2d0d960 100644
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -56,7 +56,8 @@ main(void)
assert(test_file(ctx, "keymaps/comprehensive-plus-geom.xkb"));
assert(!test_file(ctx, "keymaps/divide-by-zero.xkb"));
- assert(!test_file(ctx, "bad.xkb"));
+ assert(!test_file(ctx, "keymaps/bad.xkb"));
+ assert(!test_file(ctx, "does not exist"));
xkb_context_unref(ctx);