From 7ec4e184ba7964020af71716b3d723f87a29a85b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 13 Mar 2023 21:32:30 +0900 Subject: [PATCH 1/3] udevadm-verify: add a short summary --- src/udev/udevadm-verify.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/udev/udevadm-verify.c b/src/udev/udevadm-verify.c index c080b66f684..2e947ef8301 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; } From f99deb1e9438b02e22ce000ba8c0f19bfc189b2d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 16 Mar 2023 05:04:35 +0900 Subject: [PATCH 2/3] test: reindent testsuite-17.11.sh --- test/units/testsuite-17.11.sh | 71 ++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh index 8bcf517ea10..37754960109 100755 --- a/test/units/testsuite-17.11.sh +++ b/test/units/testsuite-17.11.sh @@ -9,9 +9,9 @@ set -o pipefail . "$(dirname "$0")"/assert.sh cleanup() { - cd / - rm -rf "${workdir}" - workdir= + cd / + rm -rf "${workdir}" + workdir= } workdir="$(mktemp -d)" @@ -23,35 +23,35 @@ rules= exp= err= 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" } assert_0() { - assert_rc 0 udevadm verify "$@" - next_test_number + assert_rc 0 udevadm verify "$@" + 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 + 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 } assert_0 -h @@ -100,9 +100,9 @@ echo "Failed to parse rules file ${rules}: No buffer space available" >"${exp}" 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}" @@ -122,16 +122,17 @@ EOF assert_1 "${rules}" test_syntax_error() { - local rule msg - rule="$1"; shift - msg="$1"; shift + local rule msg - printf '%s\n' "${rule}" >"${rules}" - cat >"${exp}" <"${rules}" + cat >"${exp}" <"${rules}" cat >"${exp}" < Date: Thu, 16 Mar 2023 05:25:39 +0900 Subject: [PATCH 3/3] test: add tests for summary output of udevadm verify --- test/units/testsuite-17.11.sh | 61 ++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh index 37754960109..50e18209576 100755 --- a/test/units/testsuite-17.11.sh +++ b/test/units/testsuite-17.11.sh @@ -18,10 +18,24 @@ workdir="$(mktemp -d)" trap cleanup EXIT cd "${workdir}" +cat >"${workdir}/default_output_1_success" <"${workdir}/default_output_1_fail" <"${out}" + if [ -f "${rules}" ]; then + diff -u "${workdir}/default_output_1_success" "${out}" + fi + next_test_number } assert_1() { + set +e + udevadm verify "$@" >"${out}" 2>"${err}" + assert_eq "$?" 1 + set -e + 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 + 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}" <"${rules}" echo "Failed to parse rules file ${rules}: No buffer space available" >"${exp}" +cp "${workdir}/default_output_1_fail" "${exo}" assert_1 "${rules}" { @@ -112,6 +144,7 @@ cat >"${exp}" <"${rules}" @@ -119,6 +152,7 @@ cat >"${exp}" <"${rules}" <<'EOF' @@ -273,6 +309,7 @@ cat >"${exp}" <"${rules}" <<'EOF' @@ -286,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' @@ -296,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