Merge remote-tracking branch 'tor-github/pr/1584'

This commit is contained in:
teor 2019-12-19 19:33:29 +10:00
commit 5c98a42f49
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -21,8 +21,49 @@ exitcode=0
export TOR_COCCI_EXCEPTIONS_FILE="${TOR_COCCI_EXCEPTIONS_FILE:-$scripts_cocci/exceptions.txt}"
if ! command -v spatch; then
echo "Install coccinelle's spatch to check cocci C parsing!"
PURPOSE="cocci C parsing"
echo "Checking spatch:"
if ! command -v spatch ; then
echo "Install coccinelle's spatch to check $PURPOSE."
exit "$exitcode"
fi
# Returns true if $1 is greater than or equal to $2
version_ge()
{
if test "$1" = "$2" ; then
# return true
return 0
fi
LOWER_VERSION="$(printf '%s\n' "$1" "$2" | $SORT_V | head -n 1)"
# implicit return
test "$LOWER_VERSION" != "$1"
}
# 'sort -V' is a gnu extension
SORT_V="sort -V"
# Use 'sort -n' if 'sort -V' doesn't work
if ! version_ge "1" "0" ; then
echo "Your 'sort -V' command appears broken. Falling back to 'sort -n'."
echo "Some spatch version checks may give the wrong result."
SORT_V="sort -n"
fi
# Print the full spatch version, for diagnostics
spatch --version
MIN_SPATCH_V="1.0.4"
# This pattern needs to handle version strings like:
# spatch version 1.0.0-rc19
# spatch version 1.0.6 compiled with OCaml version 4.05.0
SPATCH_V=$(spatch --version | head -1 | \
sed 's/spatch version \([0-9][^ ]*\).*/\1/')
if ! version_ge "$SPATCH_V" "$MIN_SPATCH_V" ; then
echo "Tor requires coccinelle spatch >= $MIN_SPATCH_V to check $PURPOSE."
echo "But you have $SPATCH_V. Please install a newer version."
exit "$exitcode"
fi
@ -44,7 +85,7 @@ else
fi
if test "$exitcode" != 0 ; then
echo "Please fix these cocci parsing errors in the above files"
echo "Please fix these $PURPOSE errors in the above files"
echo "Set VERBOSE=1 for more details"
echo "Try running test-operator-cleanup or 'make autostyle-operators'"
echo "As a last resort, you can modify scripts/coccinelle/exceptions.txt"