From dfbb53a3e4564f09ff0ccdcc0edd86690e998da4 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Wed, 29 Jun 2022 15:11:29 +0000 Subject: [PATCH] adjust error log --- Makefile | 4 +--- header-check.sh | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7476066e4b..a64dcbe883 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,6 @@ test: header-check gofmt verify-modules # Run the unit tests # NET_ADMIN capacity is required to do some network operation # SYS_ADMIN capacity is required to create network namespace - echo "########## Running the unit tests... ##########" docker run --cap-add=NET_ADMIN \ --cap-add=SYS_ADMIN --rm \ -v $(shell pwd):/go/src/github.com/flannel-io/flannel \ @@ -81,11 +80,9 @@ test: header-check gofmt verify-modules /bin/bash -c 'cd /go/src/github.com/flannel-io/flannel && go test -v -cover $(TEST_PACKAGES_EXPANDED)' # Test the docker-opts script - echo "########## Running the docker-opts tests... ##########" cd dist; ./mk-docker-opts_tests.sh # Run the functional tests - echo "########## Running the functional tests... ##########" make e2e-test e2e-test: bash_unit dist/flanneld-e2e-$(TAG)-$(ARCH).docker @@ -100,6 +97,7 @@ cover: go tool cover -html=cover.out header-check: + # run header-check script ./header-check.sh # Throw an error if gofmt finds problems. diff --git a/header-check.sh b/header-check.sh index 2247ff1e07..ef16e341c2 100755 --- a/header-check.sh +++ b/header-check.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -echo "########## Running header-check script... ##########" licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do head -n4 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e " ${file}" done;)