Skip to content

Commit

Permalink
Removed "fylr apitest" from help. Improved Makefile.
Browse files Browse the repository at this point in the history
  • Loading branch information
martinrode committed Nov 22, 2019
1 parent b54cdb1 commit b8cb4ed
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ tmpl.go
apitest_report.json
/commands/server/assets/tmpl.go
*.code-workspace
/bin/
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@ BUILDTIMESTAMP=`date -u +%d.%m.%Y_%H:%M:%S_%Z`
GITVERSIONTAG=`git tag -l 'v*' | tail -1`
LDFLAGS=-ldflags "-X main.buildTimeStamp=${BUILDTIMESTAMP} -X main.gitVersion=${GITVERSIONTAG} -X main.gitCommit=${GITCOMMIT}"

all: generate build

generate:
go generate ./...

test: generate
go vet ./...
go test ./...

gox: generate
go get github.com/mitchellh/gox
gox ${LDFLAGS} -parallel=4 -output="./bin/apitest_{{.OS}}_{{.Arch}}" ./cmd/apitest/
build: generate

build:
go build ${LDFLAGS} -o ./bin/apitest ./cmd/apitest/

.PHONY: all generate test gox build
Binary file removed cmd/apitest/apitest
Binary file not shown.
1 change: 1 addition & 0 deletions cmd/apitest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func init() {
TestCMD.PersistentFlags().BoolVar(
&logCurl, "curl-bash", false,
"Log network output as bash curl command")

TestCMD.PersistentFlags().BoolVar(
&stopOnFail, "stop-on-fail", false,
"Stop execution of later test suites if a test suite fails")
Expand Down

0 comments on commit b8cb4ed

Please sign in to comment.