filecomp: fix path and error message

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/text.c b/src/text.c
index 5286ba926dead3557b57906e751161bf8c3f86d3..1e388bae630a258ed2290f52a529f3efb0c68d70 100644 (file)
--- 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 02978971c7f0c1bbf7245c9a2ecbf9ba1d6307bf..2d0d960d593741dd5b3c94a96ec64a276bec3b27 100644 (file)
--- 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);