all: sync with master

scripts/make/go-bench.sh

@@ -7,13 +7,11 @@ readonly verbose
 #   0 = Don't print anything except for errors.
 #   1 = Print commands, but not nested commands.
 #   2 = Print everything.
-if [ "$verbose" -gt '1' ]
-then
+if [ "$verbose" -gt '1' ]; then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=1'
-elif [ "$verbose" -gt '0' ]
-then
+elif [ "$verbose" -gt '0' ]; then
 	set -x
 	v_flags='-v=1'
 	x_flags='-x=0'
@@ -26,8 +24,7 @@ readonly v_flags x_flags
 
 set -e -f -u
 
-if [ "${RACE:-1}" -eq '0' ]
-then
+if [ "${RACE:-1}" -eq '0' ]; then
 	race_flags='--race=0'
 else
 	race_flags='--race=1'
@@ -36,20 +33,20 @@ readonly race_flags
 
 go="${GO:-go}"
 
-count_flags='--count=1'
+count_flags='--count=2'
 shuffle_flags='--shuffle=on'
 timeout_flags="${TIMEOUT_FLAGS:---timeout=30s}"
 readonly go count_flags shuffle_flags timeout_flags
 
-"$go" test\
-	"$count_flags"\
-	"$shuffle_flags"\
-	"$race_flags"\
-	"$timeout_flags"\
-	"$x_flags"\
-	"$v_flags"\
-	--bench='.'\
-	--benchmem\
-	--benchtime=1s\
-	--run='^$'\
+"$go" test \
+	"$count_flags" \
+	"$shuffle_flags" \
+	"$race_flags" \
+	"$timeout_flags" \
+	"$x_flags" \
+	"$v_flags" \
+	--bench='.' \
+	--benchmem \
+	--benchtime='1s' \
+	--run='^$' \
 	./...