Browse code
Add a TESTDIRS variable to the test bundle to allow for the running of a single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Victor Marmol authored on 2014/04/30 05:03:33Showing 2 changed files
| ... | ... |
@@ -10,7 +10,7 @@ DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH)) |
| 10 | 10 |
DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH)) |
| 11 | 11 |
DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)") |
| 12 | 12 |
|
| 13 |
-DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)" |
|
| 13 |
+DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e TESTDIRS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)" |
|
| 14 | 14 |
# to allow `make DOCSDIR=docs docs-shell` |
| 15 | 15 |
DOCKER_RUN_DOCS := docker run --rm -it $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR)) -e AWS_S3_BUCKET |
| 16 | 16 |
|
| ... | ... |
@@ -17,8 +17,13 @@ bundle_test() {
|
| 17 | 17 |
{
|
| 18 | 18 |
date |
| 19 | 19 |
|
| 20 |
+ # Run all the tests if no TESTDIRS were specified. |
|
| 21 |
+ if [ -z "$TESTDIRS" ]; then |
|
| 22 |
+ TESTDIRS=$(find_dirs '*_test.go') |
|
| 23 |
+ fi |
|
| 24 |
+ |
|
| 20 | 25 |
TESTS_FAILED=() |
| 21 |
- for test_dir in $(find_dirs '*_test.go'); do |
|
| 26 |
+ for test_dir in $TESTDIRS; do |
|
| 22 | 27 |
echo |
| 23 | 28 |
|
| 24 | 29 |
if ! LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir "$test_dir"; then |