diff options
-rw-r--r-- | src/udev/udevadm-verify.c | 20 | ||||
-rwxr-xr-x | test/units/testsuite-17.11.sh | 110 |
2 files changed, 93 insertions, 37 deletions
diff --git a/src/udev/udevadm-verify.c b/src/udev/udevadm-verify.c index c080b66f68..2e947ef830 100644 --- a/src/udev/udevadm-verify.c +++ b/src/udev/udevadm-verify.c @@ -120,14 +120,30 @@ static int verify_rules_file(UdevRules *rules, const char *fname) { } static int verify_rules(UdevRules *rules, char **files) { + size_t fail_count = 0, success_count = 0; int r, rv = 0; STRV_FOREACH(fp, files) { r = verify_rules_file(rules, *fp); - if (r < 0 && rv >= 0) - rv = r; + if (r < 0) { + fail_count++; + if (rv >= 0) + rv = r; + } else + success_count++; } + printf("\n%s%zu udev rules files have been checked.%s\n" + " Success: %zu\n" + "%s Fail: %zu%s\n", + ansi_highlight(), + fail_count + success_count, + ansi_normal(), + success_count, + fail_count > 0 ? ansi_highlight_red() : "", + fail_count, + fail_count > 0 ? ansi_normal() : ""); + return rv; } diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh index 8bcf517ea1..50e1820957 100755 --- a/test/units/testsuite-17.11.sh +++ b/test/units/testsuite-17.11.sh @@ -9,51 +9,75 @@ set -o pipefail . "$(dirname "$0")"/assert.sh cleanup() { - cd / - rm -rf "${workdir}" - workdir= + cd / + rm -rf "${workdir}" + workdir= } workdir="$(mktemp -d)" trap cleanup EXIT cd "${workdir}" +cat >"${workdir}/default_output_1_success" <<EOF + +1 udev rules files have been checked. + Success: 1 + Fail: 0 +EOF +cat >"${workdir}/default_output_1_fail" <<EOF + +1 udev rules files have been checked. + Success: 0 + Fail: 1 +EOF + test_number=0 rules= exp= err= +out= next_test_number() { - : $((++test_number)) + : $((++test_number)) - local num_str - num_str=$(printf %05d "${test_number}") + local num_str + num_str=$(printf %05d "${test_number}") - rules="sample-${num_str}.rules" - exp="sample-${num_str}.exp" - err="sample-${num_str}.err" + rules="sample-${num_str}.rules" + exp="sample-${num_str}.exp" + err="sample-${num_str}.err" + exo="sample-${num_str}.exo" + out="sample-${num_str}.out" } assert_0() { - assert_rc 0 udevadm verify "$@" - next_test_number + udevadm verify "$@" >"${out}" + if [ -f "${rules}" ]; then + diff -u "${workdir}/default_output_1_success" "${out}" + fi + + next_test_number } assert_1() { - if [ -f "${exp}" ]; then - set +e - udevadm verify "$@" 2>"${err}" - assert_eq "$?" 1 - set -e - diff "${exp}" "${err}" - else - set +e - udevadm verify "$@" - assert_eq "$?" 1 - set -e - fi - next_test_number + set +e + udevadm verify "$@" >"${out}" 2>"${err}" + assert_eq "$?" 1 + set -e + + if [ -f "${exp}" ]; then + diff -u "${exp}" "${err}" + fi + + if [ -f "${exo}" ]; then + diff -u "${exo}" "${out}" + fi + + next_test_number } +# initialize variables +next_test_number + assert_0 -h assert_0 --help assert_0 -V @@ -71,8 +95,15 @@ assert_1 --resolve-names # --resolve-names= takes "early" or "never" assert_1 --resolve-names=now # Failed to parse rules file .: Is a directory +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 . # Failed to parse rules file .: Is a directory +cat >"${exo}" <<EOF + +3 udev rules files have been checked. + Success: 2 + Fail: 1 +EOF assert_1 /dev/null . /dev/null rules_dir='etc/udev/rules.d' @@ -97,12 +128,13 @@ assert_0 "${rules}" # Failed to parse rules file ${rules}: No buffer space available printf '%16384s\n' ' ' >"${rules}" echo "Failed to parse rules file ${rules}: No buffer space available" >"${exp}" +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" { - printf 'RUN+="/bin/true"%8175s\\\n' ' ' - printf 'RUN+="/bin/false"%8174s\\\n' ' ' - echo + printf 'RUN+="/bin/true"%8175s\\\n' ' ' + printf 'RUN+="/bin/false"%8174s\\\n' ' ' + echo } >"${rules}" assert_0 "${rules}" @@ -112,6 +144,7 @@ cat >"${exp}" <<EOF ${rules}:5 Line is too long, ignored ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" printf '\\\n' >"${rules}" @@ -119,19 +152,22 @@ cat >"${exp}" <<EOF ${rules}:1 Unexpected EOF after line continuation, line ignored ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" test_syntax_error() { - local rule msg - rule="$1"; shift - msg="$1"; shift + local rule msg + + rule="$1"; shift + msg="$1"; shift - printf '%s\n' "${rule}" >"${rules}" - cat >"${exp}" <<EOF + printf '%s\n' "${rule}" >"${rules}" + cat >"${exp}" <<EOF ${rules}:1 ${msg} ${rules}: udev rules check failed EOF - assert_1 "${rules}" + cp "${workdir}/default_output_1_fail" "${exo}" + assert_1 "${rules}" } test_syntax_error '=' 'Invalid key/value pair, ignoring.' @@ -243,11 +279,11 @@ test_syntax_error 'KERNEL=="", KERNEL=="?*", NAME="a"' 'conflicting match expres test_syntax_error 'KERNEL=="abc", KERNEL!="abc", NAME="b"' 'conflicting match expressions, the line takes no effect' # shellcheck disable=SC2016 test_syntax_error 'ENV{DISKSEQ}=="?*", ENV{DEVTYPE}!="partition", ENV{DISKSEQ}!="?*" ENV{ID_IGNORE_DISKSEQ}!="1", SYMLINK+="disk/by-diskseq/$env{DISKSEQ}"' \ - 'conflicting match expressions, the line takes no effect' + 'conflicting match expressions, the line takes no effect' test_syntax_error 'KERNEL!="", KERNEL=="?*", NAME="a"' 'duplicate expressions' # shellcheck disable=SC2016 test_syntax_error 'ENV{DISKSEQ}=="?*", ENV{DEVTYPE}!="partition", ENV{DISKSEQ}=="?*" ENV{ID_IGNORE_DISKSEQ}!="1", SYMLINK+="disk/by-diskseq/$env{DISKSEQ}"' \ - 'duplicate expressions' + 'duplicate expressions' echo 'GOTO="a"' >"${rules}" cat >"${exp}" <<EOF @@ -255,6 +291,7 @@ ${rules}:1 GOTO="a" has no matching label, ignoring ${rules}:1 The line takes no effect any more, dropping ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" cat >"${rules}" <<'EOF' @@ -272,6 +309,7 @@ cat >"${exp}" <<EOF ${rules}:3 LABEL="b" is unused. ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" cat >"${rules}" <<'EOF' @@ -285,6 +323,7 @@ ${rules}:1 The line takes no effect any more, dropping ${rules}:2 LABEL="b" is unused. ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" cat >"${rules}" <<'EOF' @@ -295,6 +334,7 @@ ${rules}:1 duplicate expressions ${rules}:1 conflicting match expressions, the line takes no effect ${rules}: udev rules check failed EOF +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" # udevadm verify --root |