Skip to content

Commit

Permalink
adjust error log
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasferrandiz committed Jun 29, 2022
1 parent ba69d58 commit dfbb53a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,16 @@ 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 \
golang:$(GO_VERSION) \
/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
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion header-check.sh
Original file line number Diff line number Diff line change
@@ -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;)
Expand Down

0 comments on commit dfbb53a

Please sign in to comment.