Program and files for testing CompileKeymapFromFile

A few simple test cases for verifying the operation of parsing a keymap
file and compiling a keyboard description from it.

diff --git a/test/.gitignore b/test/.gitignore
index 19c5293..d39c2e1 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,4 +1,5 @@
 *.log
+filecomp
 namescomp
 rulescomp
 xkey

diff --git a/test/Makefile.am b/test/Makefile.am
index bb86435..386f3ea 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,8 +3,8 @@ AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS)
 
 TESTS_ENVIRONMENT = $(SHELL)
 
-check_PROGRAMS = xkey namescomp rulescomp
-TESTS = xkey.sh namescomp.sh rulescomp.sh
+check_PROGRAMS = xkey filecomp namescomp rulescomp
+TESTS = xkey.sh filecomp.sh namescomp.sh rulescomp.sh
 
 clean-local:
        rm -f *.log
@@ -17,3 +17,6 @@ rulescomp_LDADD = $(top_builddir)/src/libxkbcommon.la
 
 namescomp_SOURCES = namescomp.c
 namescomp_LDADD = $(top_builddir)/src/libxkbcommon.la
+
+filecomp_SOURCES = filecomp.c
+filecomp_LDADD = $(top_builddir)/src/libxkbcommon.la

diff --git a/test/bad.xkb b/test/bad.xkb
new file mode 100644 (file)
index 0000000..f969cbc
--- /dev/null
+++ b/test/bad.xkb
@@ -0,0 +1,5 @@
+xkb_keymap {
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+us" };
+};

diff --git a/test/basic.xkb b/test/basic.xkb
new file mode 100644 (file)
index 0000000..047dbdc
--- /dev/null
+++ b/test/basic.xkb
@@ -0,0 +1,7 @@
+xkb_keymap {
+    xkb_keycodes  { include "xfree86+aliases(qwerty)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+us" };
+    xkb_geometry  { include "pc(pc105)" };
+};

diff --git a/test/default.xkb b/test/default.xkb
new file mode 100644 (file)
index 0000000..6606fc1
--- /dev/null
+++ b/test/default.xkb
@@ -0,0 +1,15 @@
+xkb_keymap {
+    xkb_keycodes  { include "xfree86+aliases(qwerty)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+us" };
+    xkb_geometry  { include "pc(pc105)" };
+};
+
+default xkb_keymap {
+    xkb_keycodes  { include "xfree86+aliases(qwertz)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+de" };
+    xkb_geometry  { include "pc(pc105)" };
+};

diff --git a/test/filecomp.c b/test/filecomp.c
new file mode 100644 (file)
index 0000000..260c151
--- /dev/null
+++ b/test/filecomp.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2009 Dan Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <X11/X.h>
+#include <X11/Xdefs.h>
+#include <X11/extensions/XKBstrcommon.h>
+#include <X11/extensions/XKBrulescommon.h>
+#include "X11/extensions/XKBcommon.h"
+#include "xkbcomp/utils.h"
+
+int main(int argc, char *argv[])
+{
+    char *path, *name;
+    FILE *file;
+    XkbcDescPtr xkb;
+
+    /* Require xkb file */
+    if (argc < 2) {
+        fprintf(stderr, "Not enough arguments\n");
+        fprintf(stderr, "Usage: %s XKBFILE [NAME]\n",
+                argv[0]);
+        exit(1);
+    }
+
+    path = argv[1];
+    name = (argc > 2) ? argv[2] : NULL;
+
+    file = fopen(path, "r");
+    if (!file) {
+        fprintf(stderr, "Failed to open file \"%s\": %s\n", path,
+                strerror(errno));
+        exit(1);
+    }
+
+    uSetErrorFile(NULL);
+    XkbcInitAtoms();
+
+    xkb = XkbcCompileKeymapFromFile(file, name);
+    fclose(file);
+
+    if (!xkb) {
+        fprintf(stderr, "Failed to compile keymap\n");
+        exit(1);
+    }
+
+    return 0;
+}

diff --git a/test/filecomp.sh b/test/filecomp.sh
new file mode 100755 (executable)
index 0000000..1418205
--- /dev/null
+++ b/test/filecomp.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+srcdir=${srcdir-.}
+builddir=${builddir-.}
+
+name=filecomp
+prog="$builddir/$name$EXEEXT"
+log="$builddir/$name.log"
+
+compile()
+{
+    echo "$prog '$1' ${2+'$2'}" >>"$log"
+    $prog "$1" ${2+"$2"} >>"$log" 2>&1 || exit $?
+}
+
+failcompile()
+{
+    echo "$prog '$1' ${2+'$2'}" >>"$log"
+    if $prog "$1" ${2+"$2"} >>"$log" 2>&1; then
+        exit 1
+    fi
+}
+
+rm -f "$log"
+
+compile basic.xkb
+compile named.xkb
+compile named.xkb de
+compile named.xkb us
+compile default.xkb
+
+failcompile basic.xkb foo
+failcompile named.xkb foo
+failcompile bad.xkb

diff --git a/test/named.xkb b/test/named.xkb
new file mode 100644 (file)
index 0000000..24b264c
--- /dev/null
+++ b/test/named.xkb
@@ -0,0 +1,15 @@
+xkb_keymap "us" {
+    xkb_keycodes  { include "xfree86+aliases(qwerty)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+us" };
+    xkb_geometry  { include "pc(pc105)" };
+};
+
+xkb_keymap "de" {
+    xkb_keycodes  { include "xfree86+aliases(qwertz)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_symbols   { include "pc+de" };
+    xkb_geometry  { include "pc(pc105)" };
+};