diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | hwdb/60-keyboard.hwdb | 2 | ||||
| -rwxr-xr-x | hwdb/parse_hwdb.py | 3 | ||||
| -rwxr-xr-x | test/hwdb-test.sh | 43 |
4 files changed, 49 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3aeb7b9ae2..5cec19fbb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3897,7 +3897,8 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TESTS TESTS += \ - test/udev-test.pl + test/udev-test.pl \ + test/hwdb-test.sh if HAVE_PYTHON TESTS += \ @@ -3952,6 +3953,7 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ test/sys.tar.xz \ test/udev-test.pl \ + test/hwdb-test.sh \ test/rule-syntax-check.py \ test/sysv-generator-test.py \ test/mocks/fsck \ diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index bbe375eb5c..c4031ab587 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -416,7 +416,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC: KEYBOARD_KEY_94=reserved # Pavilion x360 13 (Prevents random airplane mode activation) - evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr* KEYBOARD_KEY_d7=unknown # Elitebook diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py index 5d4c5ea64d..556b859191 100755 --- a/hwdb/parse_hwdb.py +++ b/hwdb/parse_hwdb.py @@ -133,7 +133,8 @@ def convert_properties(group): def parse(fname): grammar = hwdb_grammar() try: - parsed = grammar.parseFile(fname) + with open(fname, 'r', encoding='UTF-8') as f: + parsed = grammar.parseFile(f) except ParseBaseException as e: error('Cannot parse {}: {}', fname, e) return [] diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh new file mode 100755 index 0000000000..4638328059 --- /dev/null +++ b/test/hwdb-test.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# call built systemd-hwdb update on our hwdb files to ensure that they parse +# without error +# +# (C) 2016 Canonical Ltd. +# Author: Martin Pitt <martin.pitt@ubuntu.com> +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +set -e + +ROOTDIR=$(dirname $(dirname $(readlink -f $0))) +SYSTEMD_HWDB=${builddir:-.}/systemd-hwdb + +if [ ! -x "$SYSTEMD_HWDB" ]; then + echo "$SYSTEMD_HWDB does not exist, please build first" + exit 1 +fi + +D=$(mktemp --directory) +trap "rm -rf '$D'" EXIT INT QUIT PIPE +mkdir -p "$D/etc/udev" +ln -s "$ROOTDIR/hwdb" "$D/etc/udev/hwdb.d" +err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) +if [ -n "$err" ]; then + echo "$err" + exit 1 +fi +if [ ! -e "$D/etc/udev/hwdb.bin" ]; then + echo "$D/etc/udev/hwdb.bin was not generated" + exit 1 +fi |