Browse Source

Merge remote-tracking branch 'rl1987/ticket28007_take2'

Nick Mathewson 6 years ago
parent
commit
b65166750d
2 changed files with 8 additions and 0 deletions
  1. 3 0
      changes/ticket28007
  2. 5 0
      scripts/test/scan-build.sh

+ 3 - 0
changes/ticket28007

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

+ 5 - 0
scripts/test/scan-build.sh

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