From patchwork Thu Mar 17 06:35:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8607391 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AEC68C0553 for ; Thu, 17 Mar 2016 06:39:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20353202A1 for ; Thu, 17 Mar 2016 06:39:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C4582026C for ; Thu, 17 Mar 2016 06:39:36 +0000 (UTC) Received: from localhost ([::1]:32818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agRap-0006HP-Ol for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 02:39:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agRXJ-0007SA-Ur for qemu-devel@nongnu.org; Thu, 17 Mar 2016 02:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agRXJ-00085v-1j for qemu-devel@nongnu.org; Thu, 17 Mar 2016 02:35:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agRXI-00085l-SN for qemu-devel@nongnu.org; Thu, 17 Mar 2016 02:35:56 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 79D94627E3; Thu, 17 Mar 2016 06:35:56 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-6-202.pek2.redhat.com [10.72.6.202]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2H6Z6ZF002734; Thu, 17 Mar 2016 02:35:52 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 17 Mar 2016 14:35:04 +0800 Message-Id: <1458196505-5473-13-git-send-email-famz@redhat.com> In-Reply-To: <1458196505-5473-1-git-send-email-famz@redhat.com> References: <1458196505-5473-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 17 Mar 2016 06:35:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, peter.maydell@linaro.org, jsnow@redhat.com, stefanha@redhat.com, sw@weilnetz.de, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v4 12/13] docker: Add EXTRA_CONFIGURE_OPTS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Whatever passed in this variable will be appended to all configure commands. Signed-off-by: Fam Zheng Reviewed-by: Alex Bennée --- 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 033809a..4270a44 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -86,6 +86,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' @@ -106,6 +108,7 @@ docker-run-%: docker-qemu-src --privileged -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 $(SRC_COPY)):/var/tmp/qemu: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 }