git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
devtools: disable automatic probing in null testing
[dpdk.git]
/
devtools
/
checkpatches.sh
diff --git
a/devtools/checkpatches.sh
b/devtools/checkpatches.sh
index
8e2beee
..
b16bace
100755
(executable)
--- a/
devtools/checkpatches.sh
+++ b/
devtools/checkpatches.sh
@@
-36,14
+36,6
@@
LINE_SPACING,PARENTHESIS_ALIGNMENT,NETWORKING_BLOCK_COMMENT_STYLE,\
NEW_TYPEDEFS,COMPARISON_TO_NULL"
options="$options $DPDK_CHECKPATCH_OPTIONS"
NEW_TYPEDEFS,COMPARISON_TO_NULL"
options="$options $DPDK_CHECKPATCH_OPTIONS"
-clean_tmp_files() {
- if echo $tmpinput | grep -q '^checkpatches\.' ; then
- rm -f "$tmpinput"
- fi
-}
-
-trap "clean_tmp_files" INT
-
print_usage () {
cat <<- END_OF_HELP
usage: $(basename $0) [-q] [-v] [-nX|-r range|patch1 [patch2] ...]]
print_usage () {
cat <<- END_OF_HELP
usage: $(basename $0) [-q] [-v] [-nX|-r range|patch1 [patch2] ...]]
@@
-150,13
+142,16
@@
check () { # <patch> <commit> <title>
! $verbose || print_headline "$3"
if [ -n "$1" ] ; then
tmpinput=$1
! $verbose || print_headline "$3"
if [ -n "$1" ] ; then
tmpinput=$1
- elif [ -n "$2" ] ; then
- tmpinput=$(mktemp -t dpdk.checkpatches.XXXXXX)
- git format-patch --find-renames \
- --no-stat --stdout -1 $commit > "$tmpinput"
else
tmpinput=$(mktemp -t dpdk.checkpatches.XXXXXX)
else
tmpinput=$(mktemp -t dpdk.checkpatches.XXXXXX)
- cat > "$tmpinput"
+ trap "rm -f '$tmpinput'" INT
+
+ if [ -n "$2" ] ; then
+ git format-patch --find-renames \
+ --no-stat --stdout -1 $commit > "$tmpinput"
+ else
+ cat > "$tmpinput"
+ fi
fi
! $verbose || printf 'Running checkpatch.pl:\n'
fi
! $verbose || printf 'Running checkpatch.pl:\n'
@@
-191,7
+186,10
@@
check () { # <patch> <commit> <title>
ret=1
fi
ret=1
fi
- clean_tmp_files
+ if [ "$tmpinput" != "$1" ]; then
+ rm -f "$tmpinput"
+ trap - INT
+ fi
[ $ret -eq 0 ] && return 0
status=$(($status + 1))
[ $ret -eq 0 ] && return 0
status=$(($status + 1))