diff options
| author | Fam Zheng | 2016-06-01 06:25:27 +0200 |
|---|---|---|
| committer | Fam Zheng | 2016-06-01 11:27:35 +0200 |
| commit | 35e0f959b51dd8d4df0add9c01bff29ec74828ea (patch) | |
| tree | 1f27c7c61263ddb89d03195aa0df420476424396 /tests | |
| parent | docs: Add text for tests/docker in build-system.txt (diff) | |
| download | qemu-35e0f959b51dd8d4df0add9c01bff29ec74828ea.tar.gz qemu-35e0f959b51dd8d4df0add9c01bff29ec74828ea.tar.xz qemu-35e0f959b51dd8d4df0add9c01bff29ec74828ea.zip | |
docker: Add EXTRA_CONFIGURE_OPTS
Whatever passed in this variable will be appended to all
configure commands.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1464755128-32490-15-git-send-email-famz@redhat.com
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/Makefile.include | 3 | ||||
| -rwxr-xr-x | tests/docker/common.rc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ef8bcaea59..2fd2ca3057 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 74b89d6c1e..c493eebd45 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 } |