From patchwork Mon May 11 16:40:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 48311 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF7572121F for ; Mon, 11 May 2015 16:43:40 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf40234121lbb.0 for ; Mon, 11 May 2015 09:43:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=6TUioqSXcxQCd5d807rtNnowKolrMC/OFlICZ5JuCes=; b=L5OjW/+klSfhzVu0a+QOCdMqTAyUEv04+TUd1kEncV2k8JETDvIQKvyqjXwNPuz0qB CaSX5NG68zPlt1wFxIS73kYWKZ7HxYMlSQYzoFIoN/5pMSK/B6kW8jy3A53zzCHP26rJ 9SEG8/GAgrW9+EVbVjJsGKk1S0jgdTFq1dLvNg9qNf+q9OG8g1b3a2n66zo4JfX7Ry4c 17yp7eaynx/y1U0KESwoPGTnVd5B4c+oVqaCJWxJsf1Epbk8O1KAyMLW0MWt7qcxkvZK idNsWXM+Z6UwOP6TqyI4IJ0mc5ihcPXlGs2W41yZRFdfIQXAli2zAtFSjbOX+A9yWaol 8Pjg== X-Gm-Message-State: ALoCoQkWpCIW/w8IDW+03/kAJaK1tPEcrAP05XZkc5yYy1vN20ZJvkRdJGcMl4UUzBXpLb90EqBW X-Received: by 10.112.142.170 with SMTP id rx10mr8017864lbb.12.1431362619677; Mon, 11 May 2015 09:43:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.101 with SMTP id r5ls605281lar.78.gmail; Mon, 11 May 2015 09:43:39 -0700 (PDT) X-Received: by 10.112.56.42 with SMTP id x10mr8785102lbp.123.1431362619529; Mon, 11 May 2015 09:43:39 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id s10si8651272lae.50.2015.05.11.09.43.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 09:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbuc2 with SMTP id uc2so98070639lbb.2 for ; Mon, 11 May 2015 09:43:39 -0700 (PDT) X-Received: by 10.152.29.161 with SMTP id l1mr8485702lah.76.1431362619398; Mon, 11 May 2015 09:43:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1607994lbb; Mon, 11 May 2015 09:43:38 -0700 (PDT) X-Received: by 10.55.31.137 with SMTP id n9mr24094391qkh.91.1431362618153; Mon, 11 May 2015 09:43:38 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 83si7705496qkv.4.2015.05.11.09.43.37; Mon, 11 May 2015 09:43:38 -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; Received: by lists.linaro.org (Postfix, from userid 109) id 6A4CF61D83; Mon, 11 May 2015 16:43:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1DCF261D77; Mon, 11 May 2015 16:41:56 +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 35B6961C7E; Mon, 11 May 2015 16:41:40 +0000 (UTC) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by lists.linaro.org (Postfix) with ESMTPS id BED4A61D8B for ; Mon, 11 May 2015 16:40:36 +0000 (UTC) Received: by wief7 with SMTP id f7so90606237wie.0 for ; Mon, 11 May 2015 09:40:36 -0700 (PDT) X-Received: by 10.180.186.5 with SMTP id fg5mr21005991wic.60.1431362435998; Mon, 11 May 2015 09:40:35 -0700 (PDT) Received: from localhost.localdomain ([90.152.119.35]) by mx.google.com with ESMTPSA id jq3sm23621168wjc.22.2015.05.11.09.40.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 May 2015 09:40:35 -0700 (PDT) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Mon, 11 May 2015 17:40:10 +0100 Message-Id: <1431362411-8686-6-git-send-email-zoltan.kiss@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431362411-8686-1-git-send-email-zoltan.kiss@linaro.org> References: <1431362411-8686-1-git-send-email-zoltan.kiss@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 5/6] build.sh: make relocated build configurable X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zoltan.kiss@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 So users can disable it Signed-off-by: Zoltan Kiss --- build.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index cbef61b..eb7328b 100755 --- a/build.sh +++ b/build.sh @@ -29,6 +29,7 @@ export CPP_TEST="${CPP_TEST:-0}" export DISTCHECK="${DISTCHECK:-0}" export DRYRUN="${DRYRUN:-0}" export BUILD_DEPS="${BUILD_DEPS:-1}" +export RELOCATE_TEST="${RELOCATE_TEST:-1}" E_VALGRIND="${E_VALGRIND:-0}" if [[ ! -z ${TEST_LIST} ]]; then export TESTS="${TEST_LIST}" @@ -86,6 +87,7 @@ usage() { echo -e "\tNUM_CPUS:\t add parallel make, default: _NPROCESSORS_ONLN" echo -e "\tCLEANUP:\t to save workspace set CLEANUP=0, default: ${CLEANUP}" echo -e "\tBUILD_DEPS:\t build dependencies, 0: no, 1: yes, 2: yes and exit afterwards, default: ${BUILD_DEPS}" + echo -e "\tRELOCATE_TEST:\t build ODP in relocated directory, default: ${RELOCATE_TEST}" echo -e "\tM32_ON_64:\t enable 32 bit builds on a 64 bit host, default: 0" echo -e "\tDOXYGEN_HTML:\t build doxygen-html, default: 0" echo -e "\tCLANG:\t\t build with clang, default: 0" @@ -174,6 +176,7 @@ if [[ ${CPP_TEST} -eq 1 ]]; then fi fi pushd ${ODP_BUILDDIR} > /dev/null +exit_on_error git clean -xdf || exit 1 exit_on_error ./bootstrap echo ./configure ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${EXTRA_FLAGS} ${M32_CC} ${M32_LD} exit_on_error ./configure ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${EXTRA_FLAGS} ${M32_CC} ${M32_LD} @@ -217,19 +220,23 @@ elif [[ ${E_VALGRIND} -eq 1 ]]; then else exit_on_error make -j ${NUM_CPUS} exit_on_error make install - exit_on_error git clean -xdf || exit 1 - exit_on_error ./bootstrap - mkdir ${ODP_BUILDDIR}/testdir - pushd ${ODP_BUILDDIR}/testdir > /dev/null - exit_on_error ../configure ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${EXTRA_FLAGS} ${M32_CC} ${M32_LD} - exit_on_error make -j ${NUM_CPUS} - exit_on_error make install + if [[ ${RELOCATE_TEST} -eq 1 ]]; then + exit_on_error git clean -xdf || exit 1 + exit_on_error ./bootstrap + mkdir ${ODP_BUILDDIR}/testdir + pushd ${ODP_BUILDDIR}/testdir > /dev/null + exit_on_error ../configure ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${EXTRA_FLAGS} ${M32_CC} ${M32_LD} + exit_on_error make -j ${NUM_CPUS} + exit_on_error make install + fi if [[ ${M32_ON_64} -eq 1 ]]; then file test/performance/odp_scheduling else [[ -n ${ARCH} ]] || exit_on_error make check -e fi - popd > /dev/null + if [[ ${RELOCATE_TEST} -eq 1 ]]; then + popd > /dev/null + fi fi popd > /dev/null