From patchwork Mon Aug 27 23:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 145224 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp490424ljw; Mon, 27 Aug 2018 16:04:20 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbM6/fEdhbCQvDWHPsNxZpijZPygh+nE62myuAGBPjmEdjLeYWh3+E6JJ8hvXshiQoKW9oU X-Received: by 2002:a37:51d5:: with SMTP id f204-v6mr15260204qkb.265.1535411059808; Mon, 27 Aug 2018 16:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535411059; cv=none; d=google.com; s=arc-20160816; b=aMW7lTVjw6yB3xcamMpRkALqPKz81VSRPqkZWa9ChYf+3E0OQbR0IZsO7lGyB5ZY20 /pwAFdKaI+iWCkCXGQJ0bA5B2XW5Z0PCbvUouifedIDLCmpoN3AFUFyrs/OFbvCaa+zP +rmBCkwnY62rfEKRW7CAWSqNVlF7nL13D2eCKH8EzvOeLEXd2PDxAKkDmZvgSWrw2jYS DVA2RY4hzHGe3Z/3QEqQceGxdm3ufB92b6eRACSC4onzWiZD3HC4aPjxsEalWu3p3AS9 VzvnwkvLJpkr3L05VzJ6ejv316SV2SWH+G6ciUKSD4okK9Dt7WRH9DSmzTmzBu9mkKmC vAqQ== 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=SU1JK2axfzsMlnGfU2acMlzMdjAhmL9NmIMsuEe8FqE=; b=BhFWm6XgmMqQzDz02OmM1LIS9v04OYxluqG/2KePIvu9KxsXc7QT60J7hfvkMGJ12p 2O6MXMq/zbGrpEm4b3j2TSOaugN+ckcsCtHNHmnp0Noc39rJdLIiSefnUQmhZgNFeYXX M9XRqzb3SFBugeeiQ2Q1sNxtbK7eU1FOm/SU+wqjUWQ1QwIpN68HHxH830Mfhv/4fBjh 7drvuwRui2zMBuGlgGbvyDHCGzfhrm+z1TaGBhEQk7kxozbl7Obs/UNS6n95ERJYqQcl uTlq6ZSU4ELT09L+o3xIPX9tkM2WUFHbzBsTN32Ai2t7jlW7/VjBlSKk6wCOoAFXDJ4D Zd7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id x66-v6si540209qkb.197.2018.08.27.16.04.19; Mon, 27 Aug 2018 16:04:19 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 4ED5D68666; Mon, 27 Aug 2018 23:04:19 +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=-3.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW 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 B58316865D; Mon, 27 Aug 2018 23:00:54 +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 5B6606865E; Mon, 27 Aug 2018 23:00:49 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id AE9326865E for ; Mon, 27 Aug 2018 23:00:15 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 577E61805A2C for ; Tue, 28 Aug 2018 02:00:14 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8xdMBK7Rkd-0EPOGmjo; Tue, 28 Aug 2018 02:00:14 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rCYiipQZbT-0DDaBjqO; Tue, 28 Aug 2018 02:00:13 +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: Mon, 27 Aug 2018 23:00:05 +0000 Message-Id: <1535410807-29034-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535410807-29034-1-git-send-email-odpbot@yandex.ru> References: <1535410807-29034-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 681 Subject: [lng-odp] [PATCH v5 6/8] ci: rewrite coverage and distcheck scripts to follow other build scripts 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 6ce60cac1fea6d65803740f5f9b6627abf6814b3 ** Merge commit sha: 8c5d835ef3fbc6ab78503945fef582f7c60ac2c9 **/ scripts/ci/coverage.sh | 27 +++++++++------------------ scripts/ci/distcheck.sh | 22 +++++++--------------- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index 51ee277e2..2f285e95c 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -1,21 +1,11 @@ #!/bin/bash set -e -# CC LD AR CXX has to be predifubed -# - -export PKG_CONFIG_PATH="$HOME/cunit-install/x86_64/lib/pkgconfig:${PKG_CONFIG_PATH}" - -CWD=$(dirname "$0") -TDIR=`mktemp -d -p ~` - -cd ${TDIR} -echo 1000 | tee /proc/sys/vm/nr_hugepages -mkdir -p /mnt/huge -mount -t hugetlbfs nodev /mnt/huge +if [ "${CC#clang}" != "${CC}" ] ; then + export CXX="clang++" +fi -git clone ${CWD}/../../ odp -cd ./odp +cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ @@ -23,7 +13,11 @@ cd ./odp export CCACHE_DISABLE=1 make -j $(nproc) -# ignore possible failures there because these tests depends on measurements +echo 1000 | tee /proc/sys/vm/nr_hugepages +mkdir -p /mnt/huge +mount -t hugetlbfs nodev /mnt/huge + +# Ignore possible failures there because these tests depends on measurements # and systems might differ in performance. export CI="true" @@ -50,7 +44,4 @@ fi bash <(curl -s https://codecov.io/bash) -X coveragepy -cd ~ -rm -rf ${TDIR} - umount /mnt/huge diff --git a/scripts/ci/distcheck.sh b/scripts/ci/distcheck.sh index 22013473b..4f3802451 100755 --- a/scripts/ci/distcheck.sh +++ b/scripts/ci/distcheck.sh @@ -1,25 +1,17 @@ #!/bin/bash set -e -# CC LD AR CXX has to be predifubed -# +if [ "${CC#clang}" != "${CC}" ] ; then + export CXX="clang++" +fi -export PKG_CONFIG_PATH="$HOME/cunit-install/x86_64/lib/pkgconfig:${PKG_CONFIG_PATH}" - -CWD=$(dirname "$0") -TDIR=`mktemp -d -p ~` - -cd ${TDIR} -git clone ${CWD}/../../ odp -cd ./odp +cd "$(dirname "$0")"/../.. ./bootstrap -./configure --enable-user-guides +./configure \ + --enable-user-guides -make clean make distcheck make clean -make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat -cd ~ -rm -rf ${TDIR} +make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat