Skip to content

Commit

Permalink
Add new test-unit make rule which only runs the unit tests. Renames test
Browse files Browse the repository at this point in the history
bundle to test-unit.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <[email protected]> (github: vmarmol)
  • Loading branch information
vmarmol committed Apr 29, 2014
1 parent a96cac4 commit a39f3c9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-integration test-integration-cli validate
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli validate

# to allow `make BINDDIR=. shell` or `make BINDDIR= test`
BINDDIR := bundles
Expand Down Expand Up @@ -35,7 +35,10 @@ docs-release: docs-build
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./release.sh

test: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary test test-integration test-integration-cli
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-unit test-integration test-integration-cli

test-unit: build
$(DOCKER_RUN_DOCKER) hack/make.sh test-unit

test-integration: build
$(DOCKER_RUN_DOCKER) hack/make.sh test-integration
Expand Down
2 changes: 1 addition & 1 deletion hack/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ DEFAULT_BUNDLES=(

binary

test
test-unit
test-integration
test-integration-cli

Expand Down
6 changes: 3 additions & 3 deletions hack/make/test → hack/make/test-unit
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ TEXTRESET=$'\033[0m' # reset the foreground colour
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
# You can use this to select certain tests to run, eg.
#
# TESTFLAGS='-run ^TestBuild$' ./hack/make.sh test
# TESTFLAGS='-run ^TestBuild$' ./hack/make.sh test-unit
#
bundle_test() {
bundle_test_unit() {
{
date

Expand Down Expand Up @@ -52,4 +52,4 @@ bundle_test() {
} 2>&1 | tee $DEST/test.log
}

bundle_test
bundle_test_unit
2 changes: 1 addition & 1 deletion hack/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RELEASE_BUNDLES=(

if [ "$1" != '--release-regardless-of-test-failure' ]; then
RELEASE_BUNDLES=(
test test-integration
test-unit test-integration
"${RELEASE_BUNDLES[@]}"
test-integration-cli
)
Expand Down

0 comments on commit a39f3c9

Please sign in to comment.