summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDeepa Dinamani <deepa.kernel@gmail.com>2016-06-12 12:04:39 -0700
committerMichal Marek <mmarek@suse.com>2016-06-20 22:08:13 +0200
commit7a2358b3818691521c7df531415d1ea4d0398520 (patch)
tree0c2a1d541e5109a7c501580ff5ecaaeb593ed675 /scripts
parentbf56cc04ef97c8ec536e3fcd16fc57902cba339f (diff)
downloadlinux-stable-7a2358b3818691521c7df531415d1ea4d0398520.tar.gz
linux-stable-7a2358b3818691521c7df531415d1ea4d0398520.tar.bz2
linux-stable-7a2358b3818691521c7df531415d1ea4d0398520.zip
coccicheck: Allow for overriding spatch flags
Documentation/coccinelle.txt suggests using the SPFLAGS make variable to pass additional options to spatch. Reorder the way SPFLAGS is added to FLAGS, to allow for options in the SPFLAGS to override the default --very-quiet option. Similarly, rearrage the FLAGS for org or report mode. This allows for overriding of the default --no-show-diff option through SPFLAGS. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Cc: Gilles Muller <Gilles.Muller@lip6.fr> Acked-by: Nicolas Palix <nicolas.palix@imag.fr> Acked-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/coccicheck4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/coccicheck b/scripts/coccicheck
index dd85a455b2ba..f6627863fdc3 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -25,7 +25,7 @@ else
NPROC="$J"
fi
-FLAGS="$SPFLAGS --very-quiet"
+FLAGS="--very-quiet $SPFLAGS"
# spatch only allows include directories with the syntax "-I include"
# while gcc also allows "-Iinclude" and "-include include"
@@ -72,7 +72,7 @@ if [ "$MODE" = "chain" ] ; then
echo 'All available modes will be tried (in that order): patch, report, context, org'
fi
elif [ "$MODE" = "report" -o "$MODE" = "org" ] ; then
- FLAGS="$FLAGS --no-show-diff"
+ FLAGS="--no-show-diff $FLAGS"
fi
if [ "$ONLINE" = "0" ] ; then