2016-11-24 10:29:42 +00:00
|
|
|
#!/bin/sh
|
2020-11-09 04:23:58 +00:00
|
|
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
2017-11-18 17:18:16 +00:00
|
|
|
#
|
|
|
|
# Call built systemd-hwdb update on our hwdb files to ensure that they parse
|
2016-11-24 10:29:42 +00:00
|
|
|
# without error
|
|
|
|
#
|
|
|
|
# (C) 2016 Canonical Ltd.
|
|
|
|
# Author: Martin Pitt <martin.pitt@ubuntu.com>
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
2017-11-25 15:01:55 +00:00
|
|
|
export SYSTEMD_LOG_LEVEL=info
|
2016-11-24 10:29:42 +00:00
|
|
|
ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
|
2017-09-26 11:44:04 +00:00
|
|
|
SYSTEMD_HWDB=./systemd-hwdb
|
2016-11-24 10:29:42 +00:00
|
|
|
|
|
|
|
if [ ! -x "$SYSTEMD_HWDB" ]; then
|
|
|
|
echo "$SYSTEMD_HWDB does not exist, please build first"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2020-10-01 12:55:22 +00:00
|
|
|
D=$(mktemp --tmpdir --directory "hwdb-test.XXXXXXXXXX")
|
2016-11-24 10:29:42 +00:00
|
|
|
trap "rm -rf '$D'" EXIT INT QUIT PIPE
|
|
|
|
mkdir -p "$D/etc/udev"
|
2019-10-08 14:52:10 +00:00
|
|
|
ln -s "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d"
|
2016-11-30 03:41:52 +00:00
|
|
|
|
hwdb: improve and test syntax error messages
Since syntax error are non-fatal, downgrade them to warnings.
Use log_syntax to have uniform formatting including the line number.
State machine states like DATA and MATCH are internal, user-facing
messages should use the names from hwdb(7): match, property, record.
Also change "key/value" to "key-value", since there's no alternative
here, both parts must be present.
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:2] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:5] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:9] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:11] Key/value pair expected but got " NO_VALUE", ignoring
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:18] Property or empty line expected, got "BAD:7:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:22] Property or empty line expected, got "BAD:8:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:23] Match expected but got indented property " Z=z", ignoring line
squash! hwdb: improve syntax error messages
2016-12-01 15:55:32 +00:00
|
|
|
# Test "good" properties" — no warnings or errors allowed
|
2016-11-30 03:41:52 +00:00
|
|
|
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
|
2016-11-24 10:29:42 +00:00
|
|
|
if [ -n "$err" ]; then
|
|
|
|
echo "$err"
|
2016-11-30 03:41:52 +00:00
|
|
|
exit ${rc:-1}
|
2016-11-24 10:29:42 +00:00
|
|
|
fi
|
2016-11-30 03:41:52 +00:00
|
|
|
if [ -n "$rc" ]; then
|
|
|
|
echo "$SYSTEMD_HWDB returned $rc"
|
|
|
|
exit $rc
|
|
|
|
fi
|
|
|
|
|
2016-11-24 10:29:42 +00:00
|
|
|
if [ ! -e "$D/etc/udev/hwdb.bin" ]; then
|
|
|
|
echo "$D/etc/udev/hwdb.bin was not generated"
|
|
|
|
exit 1
|
|
|
|
fi
|
hwdb: improve and test syntax error messages
Since syntax error are non-fatal, downgrade them to warnings.
Use log_syntax to have uniform formatting including the line number.
State machine states like DATA and MATCH are internal, user-facing
messages should use the names from hwdb(7): match, property, record.
Also change "key/value" to "key-value", since there's no alternative
here, both parts must be present.
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:2] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:5] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:9] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:11] Key/value pair expected but got " NO_VALUE", ignoring
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:18] Property or empty line expected, got "BAD:7:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:22] Property or empty line expected, got "BAD:8:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:23] Match expected but got indented property " Z=z", ignoring line
squash! hwdb: improve syntax error messages
2016-12-01 15:55:32 +00:00
|
|
|
|
|
|
|
# Test "bad" properties" — warnings required, errors not allowed
|
|
|
|
rm -f "$D/etc/udev/hwdb.bin" "$D/etc/udev/hwdb.d"
|
|
|
|
|
2019-10-08 14:52:10 +00:00
|
|
|
ln -s "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d"
|
hwdb: improve and test syntax error messages
Since syntax error are non-fatal, downgrade them to warnings.
Use log_syntax to have uniform formatting including the line number.
State machine states like DATA and MATCH are internal, user-facing
messages should use the names from hwdb(7): match, property, record.
Also change "key/value" to "key-value", since there's no alternative
here, both parts must be present.
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:2] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:5] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:9] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:11] Key/value pair expected but got " NO_VALUE", ignoring
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:18] Property or empty line expected, got "BAD:7:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:22] Property or empty line expected, got "BAD:8:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:23] Match expected but got indented property " Z=z", ignoring line
squash! hwdb: improve syntax error messages
2016-12-01 15:55:32 +00:00
|
|
|
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
|
|
|
|
if [ -n "$rc" ]; then
|
|
|
|
echo "$SYSTEMD_HWDB returned $rc"
|
|
|
|
exit $rc
|
|
|
|
fi
|
|
|
|
if [ -n "$err" ]; then
|
|
|
|
echo "Expected warnings"
|
|
|
|
echo "$err"
|
|
|
|
else
|
|
|
|
echo "$SYSTEMD_HWDB unexpectedly printed no warnings"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ! -e "$D/etc/udev/hwdb.bin" ]; then
|
|
|
|
echo "$D/etc/udev/hwdb.bin was not generated"
|
|
|
|
exit 1
|
|
|
|
fi
|