Meta/round: exclude coccicheck from the default set

1 files changed, 14 insertions, 20 deletions

diff --git a/round b/round
index d96967bd9e..477b652709 100755
--- a/round
+++ b/round
@@ -1,26 +1,21 @@
 #!/bin/sh
 
 # Give names of targets to use on the command line
-default="sparse hdr-check leaks address undefined coccicheck check-docs doc"
+# coccicheck is not enabled by default
+default="sparse hdr-check leaks address,undefined test check-docs doc"
 skip=" "
 more=" "
 
-if test $# -eq 0
-then
-	set -- $default
-else
-	for t
-	do
-		case "$t" in
-		-*) skip="$skip${t#-} " ;;
-		?*) more="$more$t " ;;
-		esac
-	done
-	case "$more" in
-	" ")	set -- $default ;;
-	*)	set -- $more ;;
+for t
+do
+	case "$t" in
+	-)  default= ;;
+	-?*) skip="$skip${t#-} " ;;
+	?*)  more="$more$t " ;;
 	esac
-fi
+done
+
+set -- $default $more
 
 for t
 do
@@ -31,13 +26,11 @@ do
 	esac
 
 	case "$t" in
-	address | undefined)
-		Meta/Make -j16 distclean >/dev/null 2>&1 &&
+	address | undefined | address,undefined)
 		SANITIZE=$t \
 		Meta/Make -j16 test
 		;;
 	leaks)
-		Meta/Make -j16 distclean >/dev/null 2>&1 &&
 		SANITIZE=leak \
 		GIT_TEST_PASSING_SANITIZE_LEAK=true Meta/Make -j16 test
 		;;
@@ -47,6 +40,7 @@ do
 	*)
 		Meta/Make -j16 "$t"
 		;;
-	esac || return 1
+	esac &&
+	Meta/Make -j16 distclean >/dev/null 2>&1 || return 1
 done &&
 Meta/Make -j16 distclean