Merge remote-tracking branch 'rl1987/ticket28007_take2'

This commit is contained in:
Nick Mathewson 2018-12-11 09:25:46 -05:00
commit b65166750d
2 changed files with 8 additions and 0 deletions

3
changes/ticket28007 Normal file
View File

@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Cleanup scan-build.sh to silence shellcheck warnings.
Closes ticket 28007.

View File

@ -33,6 +33,7 @@ CHECKERS="\
-enable-checker security.insecureAPI.strcpy \ -enable-checker security.insecureAPI.strcpy \
" "
# shellcheck disable=SC2034
# These have high false-positive rates. # These have high false-positive rates.
EXTRA_CHECKERS="\ EXTRA_CHECKERS="\
-enable-checker alpha.security.ArrayBoundV2 \ -enable-checker alpha.security.ArrayBoundV2 \
@ -40,6 +41,7 @@ EXTRA_CHECKERS="\
-enable-checker alpha.core.CastSize \ -enable-checker alpha.core.CastSize \
" "
# shellcheck disable=SC2034
# These don't seem to generate anything useful # These don't seem to generate anything useful
NOISY_CHECKERS="\ NOISY_CHECKERS="\
-enable-checker alpha.clone.CloneChecker \ -enable-checker alpha.clone.CloneChecker \
@ -52,6 +54,7 @@ else
OUTPUTARG="" OUTPUTARG=""
fi fi
# shellcheck disable=SC2086
scan-build \ scan-build \
$CHECKERS \ $CHECKERS \
./configure ./configure
@ -61,11 +64,13 @@ scan-build \
# Make this not get scanned for dead assignments, since it has lots of # Make this not get scanned for dead assignments, since it has lots of
# dead assignments we don't care about. # dead assignments we don't care about.
# shellcheck disable=SC2086
scan-build \ scan-build \
$CHECKERS \ $CHECKERS \
-disable-checker deadcode.DeadStores \ -disable-checker deadcode.DeadStores \
make -j5 -k ./src/ext/ed25519/ref10/libed25519_ref10.a make -j5 -k ./src/ext/ed25519/ref10/libed25519_ref10.a
# shellcheck disable=SC2086
scan-build \ scan-build \
$CHECKERS $OUTPUTARG \ $CHECKERS $OUTPUTARG \
make -j5 -k make -j5 -k