aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/Makefile.include
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2016-07-19 21:20:41 +0800
committerFam Zheng <famz@redhat.com>2016-07-20 19:19:43 +0800
commitc81585130e7480a8ad9fcdbc3ff712c48260cf43 (patch)
tree7b883528ebc3d2c07a1ff02d14991a7eb51226cf /tests/docker/Makefile.include
parent6e733da676a5483314d86f1bcb14950a165b0e6f (diff)
docker: More sensible run script
It is very easy to figure out current directory and bash option from the execution, so do less in the Makefile invocation command line, and figure both options in the script. This makes the next patch easier. Signed-off-by: Fam Zheng <famz@redhat.com> Message-id: 1468934445-32183-7-git-send-email-famz@redhat.com
Diffstat (limited to 'tests/docker/Makefile.include')
-rw-r--r--tests/docker/Makefile.include4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index f88c0a7309..c5546eed78 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -114,10 +114,8 @@ docker-run-%: docker-qemu-src
-e CCACHE_DIR=/var/tmp/ccache \
-v $$(realpath $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
-v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
- -w /var/tmp/qemu \
qemu:$(IMAGE) \
- $(if $V,/bin/bash -x ,) \
- ./run \
+ /var/tmp/qemu/run \
$(CMD); \
, " RUN $(CMD) in $(IMAGE)")))