summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-05-06 17:53:53 -0700
committerJoffrey F <joffrey@docker.com>2015-05-06 17:53:53 -0700
commit070cbece0aeb3380b4bbd67c1a0ab6444df0340c (patch)
tree3652792062989a0642ce8c8ecdc59317dcc1f1ab /Makefile
parentbef23feb71bf27173a71ed9f7d28472ea84958fb (diff)
downloaddocker-py-070cbece0aeb3380b4bbd67c1a0ab6444df0340c.tar.gz
Fixes for #586
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4cb0ffd..cf291ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
.PHONY: all build test integration-test unit-test
+HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
+
all: test
build:
@@ -11,5 +13,4 @@ unit-test: build
docker run docker-py python tests/test.py
integration-test: build
- docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
-
+ docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py