-
Notifications
You must be signed in to change notification settings - Fork 608
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Makefile: coverage: don't run tests twice #3086
Merged
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
I have a patch for some of the other warnings as well (those also failed on macOS, but looks like CI ignores them); protoc -I.:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor/github.com/gogo/protobuf:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor:/home/circleci/.go_workspace/src:/usr/local/go_workspace/src:/usr/local/include --include_imports --descriptor_set_out=/tmp/descriptors.pb-2068773414 --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/moby/swarmkit/v2/api,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgithub.com/docker/swarmkit/protobuf/plugin/plugin.proto=github.com/moby/swarmkit/v2/protobuf/plugin,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types:/home/circleci/.go_workspace/src /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/ca.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/control.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/dispatcher.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/health.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/logbroker.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/objects.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/raft.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/resource.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/snapshot.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/specs.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/types.proto /home/circleci/.go_workspace/src/github.com/docker/swarmkit/api/watch.proto
/usr/local/go_workspace/src: warning: directory does not exist.
protoc -I.:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor/github.com/gogo/protobuf:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor:/home/circleci/.go_workspace/src:/usr/local/go_workspace/src:/usr/local/include --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/moby/swarmkit/v2/protobuf/plugin,Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgithub.com/docker/swarmkit/protobuf/plugin/plugin.proto=github.com/moby/swarmkit/v2/protobuf/plugin,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:/home/circleci/.go_workspace/src /home/circleci/.go_workspace/src/github.com/docker/swarmkit/protobuf/plugin/plugin.proto
/usr/local/go_workspace/src: warning: directory does not exist.
protoc -I.:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor/github.com/gogo/protobuf:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor:/home/circleci/.go_workspace/src:/usr/local/go_workspace/src:/usr/local/include --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/moby/swarmkit/v2/protobuf/plugin/deepcopy/test,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgithub.com/docker/swarmkit/protobuf/plugin/plugin.proto=github.com/moby/swarmkit/v2/protobuf/plugin,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types:/home/circleci/.go_workspace/src /home/circleci/.go_workspace/src/github.com/docker/swarmkit/protobuf/plugin/deepcopy/test/deepcopy.proto
/usr/local/go_workspace/src: warning: directory does not exist.
protoc -I.:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor/github.com/gogo/protobuf:/home/circleci/.go_workspace/src/github.com/docker/swarmkit/vendor:/home/circleci/.go_workspace/src:/usr/local/go_workspace/src:/usr/local/include --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/moby/swarmkit/v2/protobuf/plugin/raftproxy/test,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgithub.com/docker/swarmkit/protobuf/plugin/plugin.proto=github.com/moby/swarmkit/v2/protobuf/plugin,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types:/home/circleci/.go_workspace/src /home/circleci/.go_workspace/src/github.com/docker/swarmkit/protobuf/plugin/raftproxy/test/service.proto
/usr/local/go_workspace/src: warning: directory does not exist.
protoc -I /usr/local/include --decode google.protobuf.FileDescriptorSet /usr/local/include/google/protobuf/descriptor.proto |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
thaJeztah
force-pushed
the
fix_coverage
branch
from
November 19, 2022 16:48
20bf710
to
18fbd91
Compare
This comment was marked as outdated.
This comment was marked as outdated.
thaJeztah
force-pushed
the
fix_coverage
branch
from
November 19, 2022 17:39
18fbd91
to
465f89d
Compare
thaJeztah
changed the title
Makefile: fix coverage, and don't run tests twice
Makefile: coverage: don't run tests twice
Nov 19, 2022
Moved the fix for the failing test to #3087 and removed the second commit (which wasn't needed after all). @corhere @neersighted @dperny PTAL |
neersighted
approved these changes
Nov 19, 2022
Thx! Let me bring this one in |
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.
Makefile: coverage: don't run tests twice
Initially the tests were run twice, once with "-i" to "pre build" the tests;
8ebe435
Commit cb50952 removed the "-i" options,
as it's no longer needed since go1.10, however it did not remove the
(now duplicate) line, so tests were running twice.
Before this, every test was run twice:
After this, tests are only run once (cutting the time for the unit tests in ~half 😂)