From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Jun 2020 03:17:47 +0000 (+1000)
Subject: test: untangle rmlvo-to-kccgst from the test headers
X-Git-Tag: xkbcommon-1.0.0~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=928771ede01965c473bb8c7c6cc0d2f6b6cca843;p=platform%2Fupstream%2Flibxkbcommon.git

test: untangle rmlvo-to-kccgst from the test headers

Using test helpers to init the context gives it fairly specific behavior; unless
the user sets the right environment variables and/or calls it from the right
PWD, it may or may not include the test data.

Let's drop this behavior, make it a default tool to compile a keymap. If there
is a specific need to modify the include paths, we can add this later.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/test/rmlvo-to-kccgst.c b/test/rmlvo-to-kccgst.c
index 11319a4..ab9336e 100644
--- a/test/rmlvo-to-kccgst.c
+++ b/test/rmlvo-to-kccgst.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include "test.h"
 #include "xkbcomp/xkbcomp-priv.h"
 #include "xkbcomp/rules.h"
 
@@ -80,7 +79,7 @@ main(int argc, char *argv[])
         }
     }
 
-    ctx = test_get_context(0);
+    ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
     if (!ctx) {
         fprintf(stderr, "Failed to get xkb context\n");
         return 1;