diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 348800443..b6277ea30 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -37,71 +37,77 @@ jobs: strategy: matrix: include: - - type: vet - goversion: 1.15 - - type: race - goversion: 1.15 - - type: 386 - goversion: 1.15 - - type: retry - goversion: 1.15 + - type: vet+tests + goversion: 1.16 + + - type: tests + goversion: 1.16 + testflags: -race + + - type: tests + goversion: 1.16 + grpcenv: GRPC_GO_RETRY=on + - type: extras + goversion: 1.16 + + - type: tests + goversion: 1.16 + goarch: 386 + + - type: tests + goversion: 1.16 + goarch: arm64 + + - type: tests goversion: 1.15 + - type: tests goversion: 1.14 - - type: tests - goversion: 1.13 - - type: tests111 - goversion: 1.11 # Keep until interop tests no longer require Go1.11 - - type: arm64 - goversion: 1.15 + + - type: tests # Keep until interop tests no longer require Go1.11 + goversion: 1.11 steps: # Setup the environment. - - name: Setup GOARCH=386 - if: ${{ matrix.type == '386' }} - run: echo "GOARCH=386" >> $GITHUB_ENV - - name: Setup GOARCH=arm64 - if: ${{ matrix.type == 'arm64' }} - run: echo "GOARCH=arm64" >> $GITHUB_ENV + - name: Setup GOARCH + if: matrix.goarch != '' + run: echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV + - name: Setup qemu emulator - if: ${{ matrix.type == 'arm64' }} + if: matrix.goarch == 'arm64' # setup qemu-user-static emulator and register it with binfmt_misc so that aarch64 binaries # are automatically executed using qemu. run: docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset --credential yes --persistent yes - - name: Setup RETRY - if: ${{ matrix.type == 'retry' }} - run: echo "GRPC_GO_RETRY=on" >> $GITHUB_ENV + + - name: Setup GRPC environment + if: matrix.grpcenv != '' + run: echo "${{ matrix.grpcenv }}" >> $GITHUB_ENV + - name: Setup Go uses: actions/setup-go@v2 with: go-version: ${{ matrix.goversion }} + - name: Checkout repo uses: actions/checkout@v2 # Only run vet for 'vet' runs. - name: Run vet.sh - if: ${{ matrix.type == 'vet' }} + if: startsWith(matrix.type, 'vet') run: ./vet.sh -install && ./vet.sh - # Main tests run for everything except when testing "extras", the race - # detector and Go1.11 (where we run a reduced set of tests). + # Main tests run for everything except when testing "extras" + # (where we run a reduced set of tests). - name: Run tests - if: ${{ matrix.type != 'extras' && matrix.type != 'race' && matrix.type != 'tests111' }} + if: contains(matrix.type, 'tests') run: | go version - go test -cpu 1,4 -timeout 7m google.golang.org/grpc/... - - # Race detector tests - - name: Run test race - if: ${{ matrix.TYPE == 'race' }} - run: | - go version - go test -race -cpu 1,4 -timeout 7m google.golang.org/grpc/... + go test ${{ matrix.testflags }} -cpu 1,4 -timeout 7m google.golang.org/grpc/... # Non-core gRPC tests (examples, interop, etc) - name: Run extras tests - if: ${{ matrix.TYPE == 'extras' }} + if: matrix.type == 'extras' run: | go version examples/examples_test.sh @@ -109,12 +115,3 @@ jobs: interop/interop_test.sh cd ${GITHUB_WORKSPACE}/security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/... cd ${GITHUB_WORKSPACE}/security/authorization && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/authorization/... - - # Reduced set of tests for Go 1.11 - - name: Run Go1.11 tests - if: ${{ matrix.type == 'tests111' }} - run: | - go version - tests=$(find ${GITHUB_WORKSPACE} -name '*_test.go' | xargs -n1 dirname | sort -u | sed "s:^${GITHUB_WORKSPACE}:.:" | sed "s:\/$::" | grep -v ^./security | grep -v ^./credentials/sts | grep -v ^./credentials/tls/certprovider | grep -v ^./credentials/xds | grep -v ^./xds ) - echo "Running tests for " ${tests} - go test -cpu 1,4 -timeout 7m ${tests} diff --git a/credentials/tls/certprovider/pemfile/builder_test.go b/credentials/tls/certprovider/pemfile/builder_test.go index bef00e10c..2e49289ff 100644 --- a/credentials/tls/certprovider/pemfile/builder_test.go +++ b/credentials/tls/certprovider/pemfile/builder_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/credentials/tls/certprovider/pemfile/watcher_test.go b/credentials/tls/certprovider/pemfile/watcher_test.go index e43cf7358..8b7722455 100644 --- a/credentials/tls/certprovider/pemfile/watcher_test.go +++ b/credentials/tls/certprovider/pemfile/watcher_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/credentials/xds/xds_client_test.go b/credentials/xds/xds_client_test.go index 8859946ef..2c882be8a 100644 --- a/credentials/xds/xds_client_test.go +++ b/credentials/xds/xds_client_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/credentials/xds/xds_server_test.go b/credentials/xds/xds_server_test.go index 5c29ba38c..65f7e8ffa 100644 --- a/credentials/xds/xds_server_test.go +++ b/credentials/xds/xds_server_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/security/advancedtls/advancedtls_integration_test.go b/security/advancedtls/advancedtls_integration_test.go index 4bb9e645b..2fabe8f17 100644 --- a/security/advancedtls/advancedtls_integration_test.go +++ b/security/advancedtls/advancedtls_integration_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/security/advancedtls/advancedtls_test.go b/security/advancedtls/advancedtls_test.go index 64da81a17..827cf031e 100644 --- a/security/advancedtls/advancedtls_test.go +++ b/security/advancedtls/advancedtls_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/security/authorization/engine/engine_test.go b/security/authorization/engine/engine_test.go index c159c4bd5..e56f218e5 100644 --- a/security/authorization/engine/engine_test.go +++ b/security/authorization/engine/engine_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2020 gRPC authors. * diff --git a/security/authorization/engine/util_test.go b/security/authorization/engine/util_test.go index e766fbf3f..43514296d 100644 --- a/security/authorization/engine/util_test.go +++ b/security/authorization/engine/util_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/csds/csds_test.go b/xds/csds/csds_test.go index 867d74e5b..04a71a7d1 100644 --- a/xds/csds/csds_test.go +++ b/xds/csds/csds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go index 2dd31d754..524bb82e0 100644 --- a/xds/googledirectpath/googlec2p_test.go +++ b/xds/googledirectpath/googlec2p_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/googledirectpath/utils.go b/xds/googledirectpath/utils.go index 553b87adf..600441979 100644 --- a/xds/googledirectpath/utils.go +++ b/xds/googledirectpath/utils.go @@ -41,7 +41,7 @@ func getFromMetadata(timeout time.Duration, urlStr string) ([]byte, error) { } resp, err := client.Do(req) if err != nil { - return nil, fmt.Errorf("failed communicating with metadata server: %w", err) + return nil, fmt.Errorf("failed communicating with metadata server: %v", err) } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { @@ -49,7 +49,7 @@ func getFromMetadata(timeout time.Duration, urlStr string) ([]byte, error) { } body, err := ioutil.ReadAll(resp.Body) if err != nil { - return nil, fmt.Errorf("failed reading from metadata server: %w", err) + return nil, fmt.Errorf("failed reading from metadata server: %v", err) } return body, nil } diff --git a/xds/internal/balancer/balancergroup/balancergroup_test.go b/xds/internal/balancer/balancergroup/balancergroup_test.go index ab6ac3913..1ba9195ab 100644 --- a/xds/internal/balancer/balancergroup/balancergroup_test.go +++ b/xds/internal/balancer/balancergroup/balancergroup_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2019 gRPC authors. * diff --git a/xds/internal/balancer/balancergroup/testutils_test.go b/xds/internal/balancer/balancergroup/testutils_test.go index 1429fa87b..8c0543083 100644 --- a/xds/internal/balancer/balancergroup/testutils_test.go +++ b/xds/internal/balancer/balancergroup/testutils_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go index 73459dd64..5c746cfa1 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go +++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2020 gRPC authors. * diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go index 9c7bc2362..4476a1532 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go +++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2019 gRPC authors. * diff --git a/xds/internal/balancer/clusterimpl/balancer_test.go b/xds/internal/balancer/clusterimpl/balancer_test.go index 0ff27894e..d1da371c2 100644 --- a/xds/internal/balancer/clusterimpl/balancer_test.go +++ b/xds/internal/balancer/clusterimpl/balancer_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/clusterimpl/config_test.go b/xds/internal/balancer/clusterimpl/config_test.go index ccb0c5e74..f83155b53 100644 --- a/xds/internal/balancer/clusterimpl/config_test.go +++ b/xds/internal/balancer/clusterimpl/config_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/clustermanager/clustermanager_test.go b/xds/internal/balancer/clustermanager/clustermanager_test.go index a40d954ad..42c536485 100644 --- a/xds/internal/balancer/clustermanager/clustermanager_test.go +++ b/xds/internal/balancer/clustermanager/clustermanager_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/clustermanager/config_test.go b/xds/internal/balancer/clustermanager/config_test.go index 3328ba1d3..f591f5ad3 100644 --- a/xds/internal/balancer/clustermanager/config_test.go +++ b/xds/internal/balancer/clustermanager/config_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go b/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go index 7696feb5b..51b35f22f 100644 --- a/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go +++ b/xds/internal/balancer/edsbalancer/eds_impl_priority_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/balancer/edsbalancer/eds_impl_test.go b/xds/internal/balancer/edsbalancer/eds_impl_test.go index 7e793c034..c5e3071d1 100644 --- a/xds/internal/balancer/edsbalancer/eds_impl_test.go +++ b/xds/internal/balancer/edsbalancer/eds_impl_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2019 gRPC authors. * diff --git a/xds/internal/balancer/edsbalancer/eds_test.go b/xds/internal/balancer/edsbalancer/eds_test.go index 544d0a301..5c9e5f0b1 100644 --- a/xds/internal/balancer/edsbalancer/eds_test.go +++ b/xds/internal/balancer/edsbalancer/eds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/balancer/edsbalancer/util_test.go b/xds/internal/balancer/edsbalancer/util_test.go index 748aeffe2..b94905d49 100644 --- a/xds/internal/balancer/edsbalancer/util_test.go +++ b/xds/internal/balancer/edsbalancer/util_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2019 gRPC authors. * diff --git a/xds/internal/balancer/edsbalancer/xds_lrs_test.go b/xds/internal/balancer/edsbalancer/xds_lrs_test.go index 9f93e0b42..8b7aab657 100644 --- a/xds/internal/balancer/edsbalancer/xds_lrs_test.go +++ b/xds/internal/balancer/edsbalancer/xds_lrs_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/balancer/lrs/balancer_test.go b/xds/internal/balancer/lrs/balancer_test.go index b115860bf..f91937385 100644 --- a/xds/internal/balancer/lrs/balancer_test.go +++ b/xds/internal/balancer/lrs/balancer_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/balancer/lrs/config_test.go b/xds/internal/balancer/lrs/config_test.go index c460cd008..35118298b 100644 --- a/xds/internal/balancer/lrs/config_test.go +++ b/xds/internal/balancer/lrs/config_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/orca/orca_test.go b/xds/internal/balancer/orca/orca_test.go index d7a44134e..ff02b3c16 100644 --- a/xds/internal/balancer/orca/orca_test.go +++ b/xds/internal/balancer/orca/orca_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * Copyright 2019 gRPC authors. * diff --git a/xds/internal/balancer/priority/balancer_test.go b/xds/internal/balancer/priority/balancer_test.go index b15ea303d..d54621612 100644 --- a/xds/internal/balancer/priority/balancer_test.go +++ b/xds/internal/balancer/priority/balancer_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/internal/balancer/priority/config_test.go b/xds/internal/balancer/priority/config_test.go index 189aa1c91..f3a09fe3a 100644 --- a/xds/internal/balancer/priority/config_test.go +++ b/xds/internal/balancer/priority/config_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/priority/utils_test.go b/xds/internal/balancer/priority/utils_test.go index c80a89b08..a4b1a5285 100644 --- a/xds/internal/balancer/priority/utils_test.go +++ b/xds/internal/balancer/priority/utils_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/internal/balancer/weightedtarget/weightedtarget_config_test.go b/xds/internal/balancer/weightedtarget/weightedtarget_config_test.go index 57cad5c85..351a13553 100644 --- a/xds/internal/balancer/weightedtarget/weightedtarget_config_test.go +++ b/xds/internal/balancer/weightedtarget/weightedtarget_config_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/balancer/weightedtarget/weightedtarget_test.go b/xds/internal/balancer/weightedtarget/weightedtarget_test.go index eeebab733..b792c28c6 100644 --- a/xds/internal/balancer/weightedtarget/weightedtarget_test.go +++ b/xds/internal/balancer/weightedtarget/weightedtarget_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/bootstrap/bootstrap_test.go b/xds/internal/client/bootstrap/bootstrap_test.go index 501d62102..f62ed2b54 100644 --- a/xds/internal/client/bootstrap/bootstrap_test.go +++ b/xds/internal/client/bootstrap/bootstrap_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/cds_test.go b/xds/internal/client/cds_test.go index 3fb889db9..bb1117ec5 100644 --- a/xds/internal/client/cds_test.go +++ b/xds/internal/client/cds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/client_test.go b/xds/internal/client/client_test.go index 8275ea60e..69930557b 100644 --- a/xds/internal/client/client_test.go +++ b/xds/internal/client/client_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/eds_test.go b/xds/internal/client/eds_test.go index daa5d6525..9d6a3113b 100644 --- a/xds/internal/client/eds_test.go +++ b/xds/internal/client/eds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/filter_chain_test.go b/xds/internal/client/filter_chain_test.go index afb0c81fd..c68e22286 100644 --- a/xds/internal/client/filter_chain_test.go +++ b/xds/internal/client/filter_chain_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/internal/client/lds_test.go b/xds/internal/client/lds_test.go index 21e94557b..9fb27987e 100644 --- a/xds/internal/client/lds_test.go +++ b/xds/internal/client/lds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/load/store_test.go b/xds/internal/client/load/store_test.go index 46568591f..e7db4e26b 100644 --- a/xds/internal/client/load/store_test.go +++ b/xds/internal/client/load/store_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/rds_test.go b/xds/internal/client/rds_test.go index 2ca01dca9..cde40ee80 100644 --- a/xds/internal/client/rds_test.go +++ b/xds/internal/client/rds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/requests_counter_test.go b/xds/internal/client/requests_counter_test.go index 2dc336d1c..30892fc74 100644 --- a/xds/internal/client/requests_counter_test.go +++ b/xds/internal/client/requests_counter_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/tests/client_test.go b/xds/internal/client/tests/client_test.go index f5a57fbcd..755f0e05e 100644 --- a/xds/internal/client/tests/client_test.go +++ b/xds/internal/client/tests/client_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/tests/dump_test.go b/xds/internal/client/tests/dump_test.go index 58220866e..de3fcade4 100644 --- a/xds/internal/client/tests/dump_test.go +++ b/xds/internal/client/tests/dump_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/internal/client/tests/loadreport_test.go b/xds/internal/client/tests/loadreport_test.go index af145e7f2..b1ec37294 100644 --- a/xds/internal/client/tests/loadreport_test.go +++ b/xds/internal/client/tests/loadreport_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/v2/ack_test.go b/xds/internal/client/v2/ack_test.go index 813d8baa7..53c8cef18 100644 --- a/xds/internal/client/v2/ack_test.go +++ b/xds/internal/client/v2/ack_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/v2/cds_test.go b/xds/internal/client/v2/cds_test.go index c71b84532..b56ae6108 100644 --- a/xds/internal/client/v2/cds_test.go +++ b/xds/internal/client/v2/cds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/v2/client_test.go b/xds/internal/client/v2/client_test.go index e770324e1..1e464405e 100644 --- a/xds/internal/client/v2/client_test.go +++ b/xds/internal/client/v2/client_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/v2/eds_test.go b/xds/internal/client/v2/eds_test.go index 0990e7eba..7eba32f5c 100644 --- a/xds/internal/client/v2/eds_test.go +++ b/xds/internal/client/v2/eds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/v2/lds_test.go b/xds/internal/client/v2/lds_test.go index 1f4c980fa..22fa35d5e 100644 --- a/xds/internal/client/v2/lds_test.go +++ b/xds/internal/client/v2/lds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/client/v2/rds_test.go b/xds/internal/client/v2/rds_test.go index dd145158b..12495428b 100644 --- a/xds/internal/client/v2/rds_test.go +++ b/xds/internal/client/v2/rds_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/watchers_cluster_test.go b/xds/internal/client/watchers_cluster_test.go index fdef0cf61..2d10c7f43 100644 --- a/xds/internal/client/watchers_cluster_test.go +++ b/xds/internal/client/watchers_cluster_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/watchers_endpoints_test.go b/xds/internal/client/watchers_endpoints_test.go index b79397414..bff4544d2 100644 --- a/xds/internal/client/watchers_endpoints_test.go +++ b/xds/internal/client/watchers_endpoints_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/watchers_listener_test.go b/xds/internal/client/watchers_listener_test.go index bf3a122da..fdd4ebd16 100644 --- a/xds/internal/client/watchers_listener_test.go +++ b/xds/internal/client/watchers_listener_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/client/watchers_route_test.go b/xds/internal/client/watchers_route_test.go index 5f44e5493..41640b85b 100644 --- a/xds/internal/client/watchers_route_test.go +++ b/xds/internal/client/watchers_route_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/httpfilter/fault/fault_test.go b/xds/internal/httpfilter/fault/fault_test.go index 61100e8c4..20de9b9a6 100644 --- a/xds/internal/httpfilter/fault/fault_test.go +++ b/xds/internal/httpfilter/fault/fault_test.go @@ -1,3 +1,4 @@ +// +build go1.12 // +build !386 /* diff --git a/xds/internal/internal_test.go b/xds/internal/internal_test.go index 903b9db23..9240d0a89 100644 --- a/xds/internal/internal_test.go +++ b/xds/internal/internal_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/resolver/matcher_header_test.go b/xds/internal/resolver/matcher_header_test.go index fb87cc5dd..c83c3ec39 100644 --- a/xds/internal/resolver/matcher_header_test.go +++ b/xds/internal/resolver/matcher_header_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/resolver/matcher_path_test.go b/xds/internal/resolver/matcher_path_test.go index 263a04910..7b0d296fc 100644 --- a/xds/internal/resolver/matcher_path_test.go +++ b/xds/internal/resolver/matcher_path_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/resolver/matcher_test.go b/xds/internal/resolver/matcher_test.go index 7657b87bf..5c8dca5c9 100644 --- a/xds/internal/resolver/matcher_test.go +++ b/xds/internal/resolver/matcher_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/resolver/serviceconfig_test.go b/xds/internal/resolver/serviceconfig_test.go index 1e253841e..7fe821816 100644 --- a/xds/internal/resolver/serviceconfig_test.go +++ b/xds/internal/resolver/serviceconfig_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/resolver/watch_service_test.go b/xds/internal/resolver/watch_service_test.go index 2bfe3e984..421e5345a 100644 --- a/xds/internal/resolver/watch_service_test.go +++ b/xds/internal/resolver/watch_service_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/internal/resolver/xds_resolver_test.go b/xds/internal/resolver/xds_resolver_test.go index b3c2006b7..8ec29af9e 100644 --- a/xds/internal/resolver/xds_resolver_test.go +++ b/xds/internal/resolver/xds_resolver_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2019 gRPC authors. diff --git a/xds/internal/server/listener_wrapper_test.go b/xds/internal/server/listener_wrapper_test.go index 220be0e08..8b5b5c385 100644 --- a/xds/internal/server/listener_wrapper_test.go +++ b/xds/internal/server/listener_wrapper_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2021 gRPC authors. diff --git a/xds/internal/test/xds_client_integration_test.go b/xds/internal/test/xds_client_integration_test.go index f97e42af2..39b3add77 100644 --- a/xds/internal/test/xds_client_integration_test.go +++ b/xds/internal/test/xds_client_integration_test.go @@ -1,3 +1,4 @@ +// +build go1.12 // +build !386 /* diff --git a/xds/internal/test/xds_integration_test.go b/xds/internal/test/xds_integration_test.go index ae306ae78..13ab5e351 100644 --- a/xds/internal/test/xds_integration_test.go +++ b/xds/internal/test/xds_integration_test.go @@ -1,3 +1,4 @@ +// +build go1.12 // +build !386 /* diff --git a/xds/internal/test/xds_server_integration_test.go b/xds/internal/test/xds_server_integration_test.go index e31bba772..d5b9b8dd2 100644 --- a/xds/internal/test/xds_server_integration_test.go +++ b/xds/internal/test/xds_server_integration_test.go @@ -1,3 +1,4 @@ +// +build go1.12 // +build !386 /* diff --git a/xds/internal/testutils/balancer_test.go b/xds/internal/testutils/balancer_test.go index 4891eb9cd..83393dcd1 100644 --- a/xds/internal/testutils/balancer_test.go +++ b/xds/internal/testutils/balancer_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors. diff --git a/xds/server_test.go b/xds/server_test.go index 2a6677a3c..41767bc15 100644 --- a/xds/server_test.go +++ b/xds/server_test.go @@ -1,3 +1,5 @@ +// +build go1.12 + /* * * Copyright 2020 gRPC authors.