Skip to content

Commit

Permalink
Fix descent into src directory error
Browse files Browse the repository at this point in the history
  • Loading branch information
tgross committed Apr 8, 2016
1 parent 7ab3a18 commit 7dd3fd2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ Godeps/_workspace/

# fake paths from overlaying volumes in Docker
/src
containerbuddy/src/
8 changes: 4 additions & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ build: build/containerbuddy

build/containerbuddy: build/containerbuddy_build */*.go vendor
${DOCKERBUILD} go build -o build/containerbuddy -ldflags "$(LDFLAGS)"
@rm -r src || true
@rm -rf src || true

# builds the builder container
build/containerbuddy_build:
Expand Down Expand Up @@ -92,7 +92,7 @@ add-dep: build/containerbuddy_build

lint: vendor
${DOCKERBUILD} golint src/
@rm -r src || true
@rm -rf src || true

# run unit tests
TESTS ?= backends,config,core,discovery,services,telemetry,utils
Expand All @@ -101,7 +101,7 @@ test: docker vendor
${DOCKERRUN} bash -c 'for x in {$(TESTS)}; do \
go test -v github.com/joyent/containerbuddy/$$x; \
done'
@rm -r src || true
@rm -rf src || true

# run unit tests and write out test coverage
cover: docker
Expand All @@ -110,7 +110,7 @@ cover: docker
go test -v -coverprofile=cover/$$x.out github.com/joyent/containerbuddy/$$x \
&& go tool cover -html=cover/$$x.out -o cover/$$x.html ;\
done'
@rm -r src || true
@rm -rf src || true

# run integration tests
integration: build
Expand Down

0 comments on commit 7dd3fd2

Please sign in to comment.