From patchwork Thu Sep 14 11:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 112534 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp610530qgf; Thu, 14 Sep 2017 04:07:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD9jgqAu89FxqerxCGwSdKIoYrAa5To2xdp+PfkDxPx5BNV01JdzBUxD/hgNBKXxlKeZhUt X-Received: by 10.55.214.71 with SMTP id t68mr2112303qki.318.1505387125680; Thu, 14 Sep 2017 04:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505387125; cv=none; d=google.com; s=arc-20160816; b=QFrp3taXXsOAlKqCHnKV0tb9cj2zL4amj3F1EqzsVEAhqITpSfVID0oC+Riga0RcYn VdQcQbuqBfp0nRKSeNeo8buvaGeIM5cyV400X7t2WPA6dqAjOEbR0ixgjxhrJUhQ7TWy nJtsYaGVw/K5qQeOc85o0CvAlh1+EoeWrSBvlcOyishijWxsBHaRfF7HeZO/5rF8u03S QDRN4uEDck85F5dg2BKWQJtBj56RTsAN8OaNYPK4dzX1SE99aMdQTIcmBPqdt/72KxUT ztfKEJVEGeWAb/T2hO7r7hhK9hGTd230FWbdm2GAwVsv4ZKBbbKLX0D/4XeYTZCN1nqu 6ucA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=eQydThYmovqUiRyVmM7B5OnpP26KX9AiZXN/dmgXiHU=; b=flPHeAjvpq8Qv96bP16caCo1mmJ7RmjeUYBtDxNxRB/NdM+KsT2HRvHpKW9TcX4Oxr qj7bJJXTBXf2MT4T4sqLSJ6obfT/WarfztvohqfIifSLwaTxXlAMRFucv9ue1kL8wTrY Vgt2NhU/Pnzmpz63b7uhJRCE2orGufwOWossWhTzUqv+/EkyXGtwk46lEopDc0sL5jXN UCeoUmzTITxlQvs0zl9uMdAYcO7SitSF7Mij3owsI9zVZURMau9hlsaTJCwATBXU0Bi3 Qy+58ygIAHOQLeXAeU8VoFzO2nFxJ98PyX38TMazSBG3rnJvsyKh4eJTE/8a2Hsj234+ hoFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 128si15752744qkd.376.2017.09.14.04.05.25; Thu, 14 Sep 2017 04:05:25 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 57D226286D; Thu, 14 Sep 2017 11:05:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D4B3A60C1E; Thu, 14 Sep 2017 11:01:02 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 194F760813; Thu, 14 Sep 2017 11:00:26 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 58EF0609D6 for ; Thu, 14 Sep 2017 11:00:18 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward101p.mail.yandex.net (Yandex) with ESMTP id B97376A8662A for ; Thu, 14 Sep 2017 14:00:16 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id VSItSZDIV3-0Gfuj8Um; Thu, 14 Sep 2017 14:00:16 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id V9Xe4IstaW-0GOu3xO5; Thu, 14 Sep 2017 14:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 14 Sep 2017 14:00:07 +0300 Message-Id: <1505386807-2986-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505386807-2986-1-git-send-email-odpbot@yandex.ru> References: <1505386807-2986-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v5 7/7] travis: move cross-compilation into build matrix X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov As both native and cross-compilation now use the same script it is possible to move cross-compilation setup back to build matrix. Proper cross-compiler is selected based on actual compiler (gcc/clang) and cross-target. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 175 (lumag:build-x86) ** https://github.com/Linaro/odp/pull/175 ** Patch: https://github.com/Linaro/odp/pull/175.patch ** Base sha: fb3f36cec108ce9c55241d9f0e66d4832a552b8a ** Merge commit sha: 037b9d885bd9497de1ed06b5c7c1aa75d0cf22fc **/ .travis.yml | 58 +++++++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac8a4c3a..43141f9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,10 @@ env: - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" - CONF="--enable-dpdk-zero-copy" + - CROSS_ARCH="arm64" + - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - CROSS_ARCH="powerpc" + - CROSS_ARCH="i386" before_install: @@ -94,10 +98,19 @@ before_install: fi - if [ "${CC#clang}" != "${CC}" ] ; then + if [ -n "$CROSS_ARCH" ] ; + then + export CC="${CC} --target=$CROSS_GNU_TYPE" ; + fi ; export CXX="${CC/clang/clang++}"; elif [ "$CROSS_ARCH" = "i386" ] ; then + export CC="gcc -m32" ; export CXX="g++ -m32" ; + elif [ -n "$CROSS_ARCH" ] ; + then + export CC="$CROSS_GNU_TYPE"-gcc ; + export CXX="$CROSS_GNU_TYPE"-g++ ; fi - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi - ccache -s @@ -128,15 +141,17 @@ install: - sudo mkdir -p /mnt/huge - sudo mount -t hugetlbfs nodev /mnt/huge - - sudo apt-get -qq update - - sudo apt-get install linux-headers-`uname -r` - - sudo pip install coverage + - if [ -z "$CROSS_ARCH" ] ; + then + sudo apt-get -qq update ; + sudo apt-get install linux-headers-`uname -r` ; + fi - gem install asciidoctor # DPDK pktio. Note that cache must be purged if dpdk version changes. - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - | - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -z "$CROSS_ARCH" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -151,7 +166,7 @@ install: # Netmap pktio - | - if [ ! -f "netmap/LINUX/netmap.ko" ]; then + if [ -z "$CROSS_ARCH" -a ! -f "netmap/LINUX/netmap.ko" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git pushd netmap/LINUX ./configure @@ -193,41 +208,10 @@ script: jobs: include: - stage: test - compiler: aarch64-linux-gnu-gcc - env: TEST="aarch64-linux-gnu" CROSS_ARCH="arm64" - install: gem install asciidoctor - - stage: test - compiler: "\"clang-3.8 --target=aarch64-linux-gnu\"" - env: TEST="clang-3.8 aarch64-linux-gnu" CROSS_ARCH="arm64" - install: gem install asciidoctor - - stage: test - compiler: arm-linux-gnueabihf-gcc - env: TEST="arm-linux-gnueabihf" CROSS_ARCH="armhf" - install: gem install asciidoctor - - stage: test - compiler: "\"clang-3.8 --target=arm-linux-gnueabihf\"" - env: TEST="clang-3.8 arm-linux-gnueabihf" CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - install: gem install asciidoctor - - stage: test - compiler: powerpc-linux-gnu-gcc - env: TEST="powerpc-linux-gnueabi" CROSS_ARCH="powerpc" - install: gem install asciidoctor - - stage: test - compiler: "\"clang-3.8 --target=powerpc-linux-gnu\"" - env: TEST="clang-3.8 powerpc-linux-gnu" CROSS_ARCH="powerpc" - install: gem install asciidoctor - - stage: test - compiler: "\"gcc -m32\"" - env: TEST="i686-linux-gnueabi" CROSS_ARCH="i386" - install: gem install asciidoctor - - stage: test - compiler: "\"clang-3.8 -m32\"" - env: TEST="clang-3.8 i686-linux-gnu" CROSS_ARCH="i386" - install: gem install asciidoctor - - stage: test env: TEST=coverage compiler: gcc script: + - sudo pip install coverage - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides