github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1904 from dnephin/less-verbose-ci

Browse Source 
Less verbose CI output
This commit is contained in:
Kenfe-Mickaël Laventure 2017-12-15 16:13:57 -08:00 committed by GitHub
commit a921fb65ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -74,7 +74,7 @@ setup: ## install dependencies
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
# TODO(stevvooe): Install these from the vendor directory # TODO(stevvooe): Install these from the vendor directory
@go get -u github.com/alecthomas/gometalinter @go get -u github.com/alecthomas/gometalinter
@gometalinter --install @gometalinter --install > /dev/null
@go get -u github.com/stevvooe/protobuild @go get -u github.com/stevvooe/protobuild
generate: protos generate: protos
@ -83,7 +83,7 @@ generate: protos
protos: bin/protoc-gen-gogoctrd ## generate protobuf protos: bin/protoc-gen-gogoctrd ## generate protobuf
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@PATH=${ROOTDIR}/bin:${PATH} protobuild ${PACKAGES} @PATH=${ROOTDIR}/bin:${PATH} protobuild --quiet ${PACKAGES}
check-protos: protos ## check if protobufs needs to be generated again check-protos: protos ## check if protobufs needs to be generated again
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@ -114,7 +114,7 @@ endif
build: ## build the go packages build: ## build the go packages
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go build -v ${EXTRA_FLAGS} ${GO_LDFLAGS} ${GO_GCFLAGS} ${PACKAGES} @go build ${EXTRA_FLAGS} ${GO_LDFLAGS} ${GO_GCFLAGS} ${PACKAGES}
test: ## run tests, except integration tests and tests that require root test: ## run tests, except integration tests and tests that require root
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@ -170,8 +170,8 @@ uninstall:
coverage: ## generate coverprofiles from the unit tests, except tests that require root coverage: ## generate coverprofiles from the unit tests, except tests that require root
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@rm -f coverage.txt @rm -f coverage.txt
@go test -i ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) @go test -i ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) 2> /dev/null
( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}); do \ @( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}); do \
go test ${TESTFLAGS} \ go test ${TESTFLAGS} \
-cover \ -cover \
-coverprofile=profile.out \ -coverprofile=profile.out \
@ -184,8 +184,8 @@ coverage: ## generate coverprofiles from the unit tests, except tests that requi
root-coverage: ## generate coverage profiles for unit tests that require root root-coverage: ## generate coverage profiles for unit tests that require root
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go test -i ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) @go test -i ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) 2> /dev/null
( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}); do \ @( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}); do \
go test ${TESTFLAGS} \ go test ${TESTFLAGS} \
-cover \ -cover \
-coverprofile=profile.out \ -coverprofile=profile.out \