Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16318 from jmhbnz/align-race-detection

Browse Source 
Simplify go data race detection controls
This commit is contained in:
Benjamin Wang 2023-07-31 09:12:27 +01:00 committed by GitHub
commit 41ab23c67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e-arm64-template.yaml vendored
View File

@ -44,7 +44,7 @@ jobs:
echo "${TARGET}" echo "${TARGET}"
case "${TARGET}" in case "${TARGET}" in
linux-arm64-e2e) linux-arm64-e2e)
GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true RACE=true ${{ inputs.e2eTestCmd }} GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true ${{ inputs.e2eTestCmd }}
;; ;;
*) *)
echo "Failed to find target" echo "Failed to find target"

4
.github/workflows/e2e.yaml vendored
View File

@ -27,10 +27,10 @@ jobs:
echo "${TARGET}" echo "${TARGET}"
case "${TARGET}" in case "${TARGET}" in
linux-amd64-e2e) linux-amd64-e2e)
VERBOSE=1 GOOS=linux GOARCH=amd64 CPU=4 EXPECT_DEBUG=true RACE=true make test-e2e-release VERBOSE=1 GOOS=linux GOARCH=amd64 CPU=4 EXPECT_DEBUG=true make test-e2e-release
;; ;;
linux-386-e2e) linux-386-e2e)
VERBOSE=1 GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true RACE=true make test-e2e VERBOSE=1 GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true make test-e2e
;; ;;
*) *)
echo "Failed to find target" echo "Failed to find target"

4
.github/workflows/grpcproxy.yaml vendored
View File

@ -26,10 +26,10 @@ jobs:
echo "${TARGET}" echo "${TARGET}"
case "${TARGET}" in case "${TARGET}" in
linux-amd64-grpcproxy-integration) linux-amd64-grpcproxy-integration)
GOOS=linux GOARCH=amd64 CPU=4 RACE=true make test-grpcproxy-integration GOOS=linux GOARCH=amd64 CPU=4 make test-grpcproxy-integration
;; ;;
linux-amd64-grpcproxy-e2e) linux-amd64-grpcproxy-e2e)
GOOS=linux GOARCH=amd64 CPU=4 RACE=true make test-grpcproxy-e2e GOOS=linux GOARCH=amd64 CPU=4 make test-grpcproxy-e2e
;; ;;
*) *)
echo "Failed to find target" echo "Failed to find target"

2
.github/workflows/tests-arm64-nightly.yaml vendored
View File

@ -17,6 +17,6 @@ jobs:
uses: ./.github/workflows/tests-arm64-template.yaml uses: ./.github/workflows/tests-arm64-template.yaml
with: with:
etcdBranch: release-3.5 etcdBranch: release-3.5
integrationTestCmd: PASSES='integration' RACE='false' ./test.sh integrationTestCmd: PASSES='integration' ./test.sh
unitTestCmd: PASSES='unit' CPU='4' ./test.sh -p=2 unitTestCmd: PASSES='unit' CPU='4' ./test.sh -p=2
gofailMake: "no" gofailMake: "no"

6
.github/workflows/tests-arm64-template.yaml vendored
View File

@ -34,7 +34,7 @@ jobs:
- linux-arm64-integration-1-cpu - linux-arm64-integration-1-cpu
- linux-arm64-integration-2-cpu - linux-arm64-integration-2-cpu
- linux-arm64-integration-4-cpu - linux-arm64-integration-4-cpu
- linux-arm64-unit-4-cpu-race - linux-arm64-unit-4-cpu
steps: steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with: with:
@ -67,8 +67,8 @@ jobs:
if [ "${{ inputs.gofailMake }}" == "yes" ]; then make gofail-enable; fi if [ "${{ inputs.gofailMake }}" == "yes" ]; then make gofail-enable; fi
GOOS=linux GOARCH=arm64 CPU=4 ${{ inputs.integrationTestCmd }} GOOS=linux GOARCH=arm64 CPU=4 ${{ inputs.integrationTestCmd }}
;; ;;
linux-arm64-unit-4-cpu-race) linux-arm64-unit-4-cpu)
GOOS=linux GOARCH=arm64 CPU=4 RACE=true ${{ inputs.unitTestCmd }} GOOS=linux GOARCH=arm64 CPU=4 ${{ inputs.unitTestCmd }}
;; ;;
*) *)
echo "Failed to find target" echo "Failed to find target"

6
.github/workflows/tests.yaml vendored
View File

@ -12,7 +12,7 @@ jobs:
- linux-amd64-integration-1-cpu - linux-amd64-integration-1-cpu
- linux-amd64-integration-2-cpu - linux-amd64-integration-2-cpu
- linux-amd64-integration-4-cpu - linux-amd64-integration-4-cpu
- linux-amd64-unit-4-cpu-race - linux-amd64-unit-4-cpu
- linux-386-unit-1-cpu - linux-386-unit-1-cpu
steps: steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@ -42,8 +42,8 @@ jobs:
make gofail-enable make gofail-enable
GOOS=linux GOARCH=amd64 CPU=4 make test-integration GOOS=linux GOARCH=amd64 CPU=4 make test-integration
;; ;;
linux-amd64-unit-4-cpu-race) linux-amd64-unit-4-cpu)
GOOS=linux GOARCH=amd64 CPU=4 RACE=true GO_TEST_FLAGS='-p=2' make test-unit GOOS=linux GOARCH=amd64 CPU=4 GO_TEST_FLAGS='-p=2' make test-unit
;; ;;
linux-386-unit-1-cpu) linux-386-unit-1-cpu)
GOOS=linux GOARCH=386 CPU=1 GO_TEST_FLAGS='-p=4' make test-unit GOOS=linux GOARCH=386 CPU=1 GO_TEST_FLAGS='-p=4' make test-unit

2
scripts/test.sh
View File

@ -68,7 +68,7 @@ fi
# determine whether target supports race detection # determine whether target supports race detection
if [ -z "${RACE:-}" ] ; then if [ -z "${RACE:-}" ] ; then
if [ "$GOARCH" == "amd64" ]; then if [ "$GOARCH" == "amd64" ] || [ "$GOARCH" == "arm64" ]; then
RACE="--race" RACE="--race"
else else
RACE="--race=false" RACE="--race=false"