From patchwork Fri Mar 4 14:46:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8504091 Return-Path: X-Original-To: patchwork-xen-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 8B478C0553 for ; Fri, 4 Mar 2016 14:49:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A506201FE for ; Fri, 4 Mar 2016 14:49:08 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9371E20225 for ; Fri, 4 Mar 2016 14:49:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1abqzo-0005yw-GD; Fri, 04 Mar 2016 14:46:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1abqzo-0005yo-0O for xen-devel@lists.xen.org; Fri, 04 Mar 2016 14:46:24 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8E/55-02984-FBF99D65; Fri, 04 Mar 2016 14:46:23 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1457102781!28856941!1 X-Originating-IP: [209.85.161.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55783 invoked from network); 4 Mar 2016 14:46:22 -0000 Received: from mail-yw0-f196.google.com (HELO mail-yw0-f196.google.com) (209.85.161.196) by server-10.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Mar 2016 14:46:22 -0000 Received: by mail-yw0-f196.google.com with SMTP id c124so3216650ywe.0 for ; Fri, 04 Mar 2016 06:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XcG9Gm7nGYVj6oG7LRIFKPG8nMlrUDwCNX4uII8qcpk=; b=GhIqtVHbkSx2iJ5LiyG5z18U2imh9CuZ98FtCMA+Eetq7NY0qwG/OPIERHpjcCanuy 3orKcvlmCRjCV3eEnhBjXNoOnnNIIyx8ZUEHaRlFujXC2W+3iQ02gdTKwArc3mhAqNH4 xUyFCbemWX7Jfev3czqp9m3wM9e2stK3aZzBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XcG9Gm7nGYVj6oG7LRIFKPG8nMlrUDwCNX4uII8qcpk=; b=bw0XzmgPqitGf73M/iPsUwGCt+q+OPIhd+gAcPDa5t2Ba+i++mt3l5WE4XeukyZO8s Mz0cLUXlfhi34k8Yh+I2NYUcY8Af5EUQinqT9Mx2+SIbuBVIXPlcGov8lcEeQjv8BKtw V0Vjztvc3cqwnMBY3VErbnpJ7WKWucAB6Dc8Z8Bv4M1bBCxuzF+CmR/nye41NNnoNZxL WJ3Tx5XX6xpDtVkO/yCZpRR5nhnPH7PYs6oPr3SlbDffx6xQD7WfscaUQ5kQlCW1aPdO Nj9Bap0nErrpKk3D/eAo/ILy+GzAoaVjdof8b6jRyK3K+TumiMDRl9eVbAmk04L1MxDU xrxQ== X-Gm-Message-State: AD7BkJIWjnCNiKOjoW7OFOi3jINbjRLmt1j8F7Kf1Ul5ahB9zPlfZWgOW9WFhTLhax0Wug== X-Received: by 10.13.241.68 with SMTP id a65mr4845146ywf.324.1457102781409; Fri, 04 Mar 2016 06:46:21 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id x129sm3087040ywd.19.2016.03.04.06.46.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 06:46:19 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Fri, 4 Mar 2016 08:46:06 -0600 Message-Id: <1457102767-3012-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1457102767-3012-1-git-send-email-cardoe@cardoe.com> References: <1457102767-3012-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Doug Goldstein , Ian Jackson , Tim Deegan , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH 2/3] travis: use matching C++ for GCC version X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_BL_SPAMCOP_NET, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no 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 When we use GCC 5.x, we need to install the C++ compiler and the C compiler together because QEMU tests for feature flags against the C compiler and assumes the C++ compiler has them. We also have to ensure that it is used. Have to do the modification of the CXX variable in two steps to ensure we support older versions of bash in use by the test machines. While we're at it simply how we select our compiler. Signed-off-by: Doug Goldstein --- CC: Ian Jackson CC: Jan Beulich CC: Keir Fraser CC: Tim Deegan CC: Andrew Cooper --- .travis.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74fa14e..f3d4b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,20 +13,20 @@ matrix: env: XEN_TARGET_ARCH=x86_64 - compiler: gcc env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y - - compiler: gcc - env: XEN_TARGET_ARCH=x86_64 COMPILER=gcc-5 + - compiler: gcc-5 + env: XEN_TARGET_ARCH=x86_64 - compiler: gcc env: XEN_TARGET_ARCH=x86_64 debug=y - - compiler: gcc - env: XEN_TARGET_ARCH=x86_64 COMPILER=gcc-5 debug=y + - compiler: gcc-5 + env: XEN_TARGET_ARCH=x86_64 debug=y - compiler: clang env: XEN_TARGET_ARCH=x86_64 clang=y - - compiler: clang - env: XEN_TARGET_ARCH=x86_64 COMPILER=clang-3.8 clang=y + - compiler: clang-3.8 + env: XEN_TARGET_ARCH=x86_64 clang=y - compiler: clang env: XEN_TARGET_ARCH=x86_64 clang=y debug=y - - compiler: clang - env: XEN_TARGET_ARCH=x86_64 COMPILER=clang-3.8 clang=y debug=y + - compiler: clang-3.8 + env: XEN_TARGET_ARCH=x86_64 clang=y debug=y - compiler: gcc env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- - compiler: gcc @@ -72,15 +72,18 @@ addons: - gcc-arm-linux-gnueabihf - gcc-aarch64-linux-gnu - gcc-5 + - g++-5 - clang-3.8 +# we must set CXX manually instead of using 'language: cpp' due to +# travis-ci/travis-ci#3871 before_script: - - export CC=${COMPILER:-${CC}} - - ${CC} --version + - export CXX=${CC/cc/++} + - export CXX=${CXX/clang/clang++} script: - ( [ "x${RANDCONFIG}" = "xy" ] && ( make -C xen randconfig ) || exit 0 ) - ( ./configure --disable-tools --disable-stubdom --enable-docs && - make CC="${CROSS_COMPILE}${CC}" HOSTCC="${CC}" dist ) + make dist ) after_script: - cat xen/.config notifications: