Skip to content

Commit

Permalink
Merge pull request #130 from jsafrane/use-binary-for-e2e
Browse files Browse the repository at this point in the history
Use binary complied by make for e2e tests.
  • Loading branch information
k8s-ci-robot authored Oct 27, 2018
2 parents 94920f2 + 302cffc commit 3e3231b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ matrix:
- go: 1.10.3
script:
- make test
- make
after_success:
- if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
make container
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ container: $(APP)
push: container
docker push $(IMAGE_NAME):$(IMAGE_VERSION)

test:
test: $(APP)
files=$$(find ./ -name '*.go' | grep -v '^./vendor' ); \
if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \
echo "formatting errors:"; \
Expand Down
2 changes: 1 addition & 1 deletion hack/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ runTestAPI()
fi
}

go build -o bin/mock ./mock || exit 1
test -x bin/mock || exit 1

cd cmd/csi-sanity
make clean install || exit 1
Expand Down

0 comments on commit 3e3231b

Please sign in to comment.