Makefile: Fix errors when specifying RACE #11631
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes: ``` $ sudo -E make SKIP_VET=true SKIP_KVSTORES=true TESTPKGS=pkg/aws/eni RACE=1 unit-tests dirname: missing operand Try 'dirname --help' for more information. make -C tools/maptool/ make[1]: Entering directory '/home/chris/code/cilium/cilium/tools/maptool' CGO_ENABLED=0 go build -mod=vendor -race -ldflags '-X "github.com/cilium/cilium/pkg/version.Version=1.7.90 2d4cc76 2020-05-20T12:25:41-07:00 go version go1.14.2 linux/amd64" -s -w -X "github.com/cilium/cilium/pkg/envoy.RequiredEnvoyVersionSHA=a3385205ad620550b35d3b0b651e40898386e6e3" -X "github.com/cilium/cilium/pkg/datapath/loader.DatapathSHA=7359bebb8825a116e3b022e9a3ff35045d0709ce" ' -o maptool go build: -race requires cgo; enable cgo by setting CGO_ENABLED=1 make[1]: *** [Makefile:14: maptool] Error 2 make[1]: Leaving directory '/home/chris/code/cilium/cilium/tools/maptool' make: *** [Makefile:216: unit-tests] Error 2 ``` Signed-off-by: Chris Tarazi <chris@isovalent.com>
Fixes:
```
$ sudo -E make SKIP_VET=true SKIP_KVSTORES=true TESTPKGS=pkg/aws/eni RACE=1 unit-tests
make -C tools/maptool/
..
echo "mode: count" > coverage-all-tmp.out
echo "mode: count" > coverage.out
...
for pkg in github.com/cilium/cilium/pkg/aws/eni; do \
go test -mod=vendor -race -ldflags "-X github.com/cilium/cilium/pkg/kvstore.consulDummyConfigFile=/tmp/cilium-consul-certs/cilium-consul.yaml -X github.com/cilium/cilium/pkg/testutils.CiliumRootDir=/home/chris/code/cilium/cilium -X github.com/cilium/cilium/pkg/datapath.DatapathSHA=1234567890abcdef7890 -X github.com/cilium/cilium/pkg/logging.DefaultLogLevelStr="error"" $pkg -test.v -timeout 360s -coverprofile=coverage.out -covermode=count -coverpkg github.com/cilium/cilium/pkg/aws/eni \
|| exit 1; \
tail -n +2 coverage.out >> coverage-all-tmp.out; \
done
-covermode must be "atomic", not "count", when -race is enabled
make: *** [Makefile:224: unit-tests] Error 1
```
Signed-off-by: Chris Tarazi <chris@isovalent.com>
christarazi
added
area/build
|
Please set the appropriate release note label. |
|
test-me-please Edit: runtime hit #11512 |
michi-covalent
approved these changes
May 21, 2020
|
retest-runtime |
christarazi
added
the
ready-to-merge
joestringer
approved these changes
May 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See commit msgs.