[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/16] docker: Add EXTRA_CONFIGURE_OPTS
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 14/16] docker: Add EXTRA_CONFIGURE_OPTS |
Date: |
Wed, 1 Jun 2016 17:45:22 +0800 |
Whatever passed in this variable will be appended to all
configure commands.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden
---
tests/docker/Makefile.include | 3 +++
tests/docker/common.rc | 1 +
2 files changed, 4 insertions(+)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ef8bcae..2fd2ca3 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -87,6 +87,8 @@ docker:
@echo
@echo 'Special variables:'
@echo ' TARGET_LIST=a,b,c Override target list in builds.'
+ @echo ' EXTRA_CONFIGURE_OPTS="..."'
+ @echo ' Extra configure options.'
@echo ' IMAGES="a b c ..": Filters which images to build or run.'
@echo ' TESTS="x y z .." Filters which tests to run (for
docker-test).'
@echo ' J=[0..9]* Overrides the -jN parameter for make
commands'
@@ -108,6 +110,7 @@ docker-run-%: docker-qemu-src
-t \
$(if $(DEBUG),-i,--net=none) \
-e TARGET_LIST=$(TARGET_LIST) \
+ -e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS)
\
-e V=$V -e J=$J -e DEBUG=$(DEBUG)\
-e CCACHE_DIR=/var/tmp/ccache \
-v $$(realpath
$(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 74b89d6..c493eeb 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -26,6 +26,7 @@ build_qemu()
$QEMU_SRC/configure \
--target-list="${TARGET_LIST}" \
--prefix="$PWD/install" \
+ $EXTRA_CONFIGURE_OPTS \
"$@"
make $MAKEFLAGS
}
--
2.8.2
- Re: [Qemu-devel] [PULL 04/16] Makefile: Rules for docker testing, (continued)
- [Qemu-devel] [PULL 05/16] docker: Add images, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 02/16] rules.mak: Add "COMMA" constant, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 09/16] docker: Add full test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 07/16] docker: Add common.rc, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 10/16] docker: Add clang test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 08/16] docker: Add quick test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 06/16] docker: Add test runner, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 12/16] docker: Add travis tool, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 13/16] docs: Add text for tests/docker in build-system.txt, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 14/16] docker: Add EXTRA_CONFIGURE_OPTS,
Fam Zheng <=
- [Qemu-devel] [PULL 11/16] docker: Add mingw test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 16/16] .gitignore: Ignore docker source copy, Fam Zheng, 2016/06/01
- [Qemu-devel] [PULL 15/16] MAINTAINERS: Add tests/docker, Fam Zheng, 2016/06/01
- Re: [Qemu-devel] [PULL v2 00/16] docker queue, Peter Maydell, 2016/06/02