mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parser: equality tests: consitently dump error output to stderr

Browse source 
printf of failure/error info should be going to stderr. Unfortunately
the test has a mix of 2>&1 and 1>&2. Having a mix is just wrong, we
could standardize on either but since the info is error info 1>&2
seems to be the better choice.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2024-12-05 10:26:07 -08:00
parent 57c57f198c
commit 31e60baab2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
parser/tst/equality.sh
View file

@ -137,8 +137,8 @@ verify_binary()
elif [ "$t" == "equality" ] && [ "$hash" != "$good_hash" ] elif [ "$t" == "equality" ] && [ "$hash" != "$good_hash" ]
then then
if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi
printf "\nFAIL: Hash values do not match\n" 2>&1 printf "\nFAIL: Hash values do not match\n" 1>&2
printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 2>&1 printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 1>&2
printf "known-good (%s) != profile-under-test (%s) for the following profiles:\nknown-good %s\nprofile-under-test %s\n\n" \ printf "known-good (%s) != profile-under-test (%s) for the following profiles:\nknown-good %s\nprofile-under-test %s\n\n" \
"$good_hash" "$hash" "$good_profile" "$profile" 1>&2 "$good_hash" "$hash" "$good_profile" "$profile" 1>&2
((fails++)) ((fails++))
@ -146,8 +146,8 @@ verify_binary()
elif [ "$t" == "xequality" ] && [ "$hash" == "$good_hash" ] elif [ "$t" == "xequality" ] && [ "$hash" == "$good_hash" ]
then then
if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi
printf "\nunexpected PASS: equality test with known problem, Hash values match\n" 2>&1 printf "\nunexpected PASS: equality test with known problem, Hash values match\n" 1>&2
printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 2>&1 printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 1>&2
printf "known-good (%s) == profile-under-test (%s) for the following profile:\nknown-good %s\nprofile-under-test %s\n\n" \ printf "known-good (%s) == profile-under-test (%s) for the following profile:\nknown-good %s\nprofile-under-test %s\n\n" \
"$good_hash" "$hash" "$good_profile" "$profile" 1>&2 "$good_hash" "$hash" "$good_profile" "$profile" 1>&2
((fails++)) ((fails++))
@ -158,8 +158,8 @@ verify_binary()
elif [ "$t" == "inequality" ] && [ "$hash" == "$good_hash" ] elif [ "$t" == "inequality" ] && [ "$hash" == "$good_hash" ]
then then
if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi
printf "\nFAIL: Hash values match\n" 2>&1 printf "\nFAIL: Hash values match\n" 1>&2
printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 2>&1 printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 1>&2
printf "known-good (%s) == profile-under-test (%s) for the following profiles:\nknown-good %s\nprofile-under-test %s\n\n" \ printf "known-good (%s) == profile-under-test (%s) for the following profiles:\nknown-good %s\nprofile-under-test %s\n\n" \
"$good_hash" "$hash" "$good_profile" "$profile" 1>&2 "$good_hash" "$hash" "$good_profile" "$profile" 1>&2
((fails++)) ((fails++))
@ -167,8 +167,8 @@ verify_binary()
elif [ "$t" == "xinequality" ] && [ "$hash" != "$good_hash" ] elif [ "$t" == "xinequality" ] && [ "$hash" != "$good_hash" ]
then then
if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi if [ -z "$verbose" ] ; then printf "Binary %s %s" "$t" "$desc" ; fi
printf "\nunexpected PASS: inequality test with known problem, Hash values do not match\n" 2>&1 printf "\nunexpected PASS: inequality test with known problem, Hash values do not match\n" 1>&2
printf "parser: %s --features-file %s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 2>&1 printf "parser: %s --features-file %s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 1>&2
printf "known-good (%s) != profile-under-test (%s) for the following profile:\nknown-good %s\nprofile-under-test %s\n\n" \ printf "known-good (%s) != profile-under-test (%s) for the following profile:\nknown-good %s\nprofile-under-test %s\n\n" \
"$good_hash" "$hash" "$good_profile" "$profile" 1>&2 "$good_hash" "$hash" "$good_profile" "$profile" 1>&2
((fails++)) ((fails++))
@ -176,7 +176,7 @@ verify_binary()
elif [ "$t" == "xinequality" ] && [ "$hash" == "$good_hash" ] elif [ "$t" == "xinequality" ] && [ "$hash" == "$good_hash" ]
then then
printf "\nknown problem %s %s: unchanged" "$t" "$desc" 1>&2 printf "\nknown problem %s %s: unchanged" "$t" "$desc" 1>&2
printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 2>&1 printf "parser: %s --features-file=%s\n" "${APPARMOR_PARSER}" "${_SCRIPTDIR}/features_files/$features_file" 1>&2
fi fi
done done
@ -818,7 +818,7 @@ verify_binary_equality "'$p1'x'$p2' mount specific deny doesn't affect non-overl
if [ $fails -ne 0 ] || [ $errors -ne 0 ] if [ $fails -ne 0 ] || [ $errors -ne 0 ]
then then
printf "ERRORS: %d\nFAILS: %d\n" $errors $fails 2>&1 printf "ERRORS: %d\nFAILS: %d\n" $errors $fails 1>&2
exit $((fails + errors)) exit $((fails + errors))
fi fi