spatch now returns -1 when a virtual rule (given with -D on the command line) is not defined in the semantic patch. Using this spatch feature, coccicheck is now tries several modes by default, in the order: patch, report, context, org
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -16,6 +16,7 @@ if [ "$C" = "1" -o "$C" = "2" ]; then · 15 unmodified lines | ||
| 16 | 16 | else |
| 17 | 17 | ONLINE=0 |
| 18 | 18 | FLAGS="-very_quiet" |
| 19 | + OPTIONS="-dir $srctree" | |
| 19 | 20 | fi |
| 20 | 21 | |
| 21 | 22 | if [ ! -x "$SPATCH" ]; then |
| @@ -25,11 +26,11 @@ fi · 3 unmodified lines | ||
| 25 | 26 | |
| 26 | 27 | if [ "$MODE" = "" ] ; then |
| 27 | 28 | if [ "$ONLINE" = "0" ] ; then |
| 28 | − echo 'You have not explicitly specified the mode to use. Fallback to "report".' | |
| 29 | + echo 'You have not explicitly specified the mode to use. Using default "chain" mode.' | |
| 30 | + echo 'All available modes will be tried (in that order): patch, report, context, org' | |
| 29 | 31 | echo 'You can specify the mode with "make coccicheck MODE=<mode>"' |
| 30 | − echo 'Available modes are: report, patch, context, org' | |
| 31 | 32 | fi |
| 32 | − MODE="report" | |
| 33 | + MODE="chain" | |
| 33 | 34 | fi |
| 34 | 35 | |
| 35 | 36 | if [ "$ONLINE" = "0" ] ; then |
| @@ -71,10 +72,15 @@ coccinelle () { · 35 unmodified lines | ||
| 71 | 72 | sed -ne 's|^//#||p' $COCCI |
| 72 | 73 | echo '' |
| 73 | 74 | fi |
| 75 | + fi | |
| 74 | 76 | |
| 75 | − $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $srctree || exit 1 | |
| 77 | + if [ "$MODE" = "chain" ] ; then | |
| 78 | + $SPATCH -D patch $FLAGS -sp_file $COCCI $OPT $OPTIONS || \ | |
| 79 | + $SPATCH -D report $FLAGS -sp_file $COCCI $OPT $OPTIONS || \ | |
| 80 | + $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS || \ | |
| 81 | + $SPATCH -D org $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 | |
| 76 | 82 | else |
| 77 | − $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 | |
| 83 | + $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 | |
| 78 | 84 | fi |
| 79 | 85 | |
| 80 | 86 | } |