Skip to content

Commit 6448e27

Browse files
committedSep 20, 2019
Use -race in CI
1 parent bb2bb48 commit 6448e27

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed
 

‎ci/fmt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ unstaged_files() {
3232
}
3333

3434
check() {
35-
if [[ ${CI:-} && $(unstaged_files) != "" ]]; then
35+
if [[ ${CI-} && $(unstaged_files) != "" ]]; then
3636
echo
3737
echo "Files need generation or are formatted incorrectly."
3838
echo "Run:"

‎ci/test.sh

+11-13
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ set -euo pipefail
44
cd "$(dirname "${0}")"
55
cd "$(git rev-parse --show-toplevel)"
66

7-
argv=(
8-
go run gotest.tools/gotestsum
9-
"--format=short-verbose"
10-
--
11-
"-vet=off"
7+
argv+=(go test
8+
"-parallel=1024"
9+
"-coverprofile=ci/out/coverage.prof"
10+
"-coverpkg=./..."
1211
)
13-
# Interactive usage does not want to turn off vet or use gotestsum.
14-
if [[ $# -gt 0 ]]; then
15-
argv=(go test "$@")
12+
13+
if [[ ${CI-} ]]; then
14+
argv+=(
15+
"-race"
16+
)
1617
fi
1718

18-
# We always want coverage and race detection.
1919
argv+=(
20-
"-parallel=512"
21-
"-coverprofile=ci/out/coverage.prof"
22-
"-coverpkg=./..."
20+
"$@"
2321
)
2422

2523
mkdir -p ci/out/websocket
@@ -30,6 +28,6 @@ grep -v _string.go < ci/out/coverage.prof > ci/out/coverage2.prof
3028
mv ci/out/coverage2.prof ci/out/coverage.prof
3129

3230
go tool cover -html=ci/out/coverage.prof -o=ci/out/coverage.html
33-
if [[ ${CI:-} ]]; then
31+
if [[ ${CI-} ]]; then
3432
bash <(curl -s https://codecov.io/bash) -Z -R . -f ci/out/coverage.prof
3533
fi

‎go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ require (
1212
github.com/mattn/go-isatty v0.0.9 // indirect
1313
github.com/pkg/errors v0.8.1 // indirect
1414
github.com/sirupsen/logrus v1.4.2 // indirect
15-
github.com/spf13/pflag v1.0.3 // indirect
15+
github.com/spf13/pflag v1.0.5 // indirect
1616
github.com/stretchr/testify v1.4.0 // indirect
1717
go.coder.com/go-tools v0.0.0-20190317003359-0c6a35b74a16
1818
go.uber.org/atomic v1.4.0 // indirect
1919
go.uber.org/multierr v1.1.0
2020
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
21-
golang.org/x/sys v0.0.0-20190904005037-43c01164e931 // indirect
21+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
22+
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13 // indirect
2223
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
2324
golang.org/x/tools v0.0.0-20190903163617-be0da057c5e3
2425
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

‎go.sum

+6-4
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4
5353
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
5454
github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4=
5555
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
56-
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
57-
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
56+
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
57+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
5858
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
5959
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6060
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -80,14 +80,16 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
8080
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
8181
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
8282
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
83+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
84+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
8385
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
8486
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
8587
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
8688
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
8789
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8890
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
89-
golang.org/x/sys v0.0.0-20190904005037-43c01164e931 h1:+WYfosiOJzB4BjsISl1Rv4ZLUy+VYcF+u+0Y9jcerv8=
90-
golang.org/x/sys v0.0.0-20190904005037-43c01164e931/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
91+
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13 h1:/zi0zzlPHWXYXrO1LjNRByFu8sdGgCkj2JLDdBIB84k=
92+
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9193
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
9294
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
9395
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=

0 commit comments

Comments
 (0)
Please sign in to comment.