diff mbox

generic: external EXTRA_FLAGS overwrites script default

Message ID CADz3at1Sb-TnHrP=34AgV5KHzzStxTormCADm5Z8kvAm3COA_g@mail.gmail.com
State New
Headers show

Commit Message

Mike Holmes May 14, 2015, 3:55 p.m. UTC
Patches for the check-odp scrips are easier to identify if we use
--subject-prefix="check-odp PATCH"

I locally added a  PERF_TEST flag in the environment to disable PERF, not
fully tested but attached for consideration since it works in a way aligned
with all the other flags to the script.

On 14 May 2015 at 11:43, Zoltan Kiss <zoltan.kiss@linaro.org> wrote:

> The previous patch just added the values defined by the caller, this patch
> changes behaviour to overwrite the script default entirely. Not everyone
> wants
> the perf tests to run on make check.
>
> Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
> ---
>  helper/generic | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/helper/generic b/helper/generic
> index aa1b10a..1dbb41f 100644
> --- a/helper/generic
> +++ b/helper/generic
> @@ -3,7 +3,7 @@
>  export SRCDIR=${ROOT_DIR}/src
>  export BUILDDIR=${ROOT_DIR}/build
>  export LOGDIR=${ROOT_DIR}/log
> -export EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf"
> +export EXTRA_FLAGS="${EXTRA_FLAGS:- --enable-test-perf}"
>
>  mkdir -p ${SRCDIR}
>  mkdir -p ${BUILDDIR}
> --
> 1.9.1
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>

Comments

Anders Roxell May 14, 2015, 7:13 p.m. UTC | #1
On 2015-05-14 11:55, Mike Holmes wrote:
> Patches for the check-odp scrips are easier to identify if we use
> --subject-prefix="check-odp PATCH"
> 
> I locally added a  PERF_TEST flag in the environment to disable PERF, not
> fully tested but attached for consideration since it works in a way aligned
> with all the other flags to the script.
> 
> On 14 May 2015 at 11:43, Zoltan Kiss <zoltan.kiss@linaro.org> wrote:
> 
> > The previous patch just added the values defined by the caller, this patch
> > changes behaviour to overwrite the script default entirely. Not everyone
> > wants
> > the perf tests to run on make check.
> >
> > Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
> > ---
> >  helper/generic | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/helper/generic b/helper/generic
> > index aa1b10a..1dbb41f 100644
> > --- a/helper/generic
> > +++ b/helper/generic
> > @@ -3,7 +3,7 @@
> >  export SRCDIR=${ROOT_DIR}/src
> >  export BUILDDIR=${ROOT_DIR}/build
> >  export LOGDIR=${ROOT_DIR}/log
> > -export EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf"
> > +export EXTRA_FLAGS="${EXTRA_FLAGS:- --enable-test-perf}"

I would like to do it with an env var instead like Mike did it.

> >
> >  mkdir -p ${SRCDIR}
> >  mkdir -p ${BUILDDIR}
> > --
> > 1.9.1
> >
> > _______________________________________________
> > lng-odp mailing list
> > lng-odp@lists.linaro.org
> > https://lists.linaro.org/mailman/listinfo/lng-odp
> >
> 
> 
> 
> -- 
> Mike Holmes
> Technical Manager - Linaro Networking Group
> Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs

> From fb7274ef5bd95e08136b1178eb72c009fe733702 Mon Sep 17 00:00:00 2001
> From: Mike Holmes <mike.holmes@linaro.org>
> Date: Thu, 14 May 2015 11:53:58 -0400
> Subject: [PATCH] optional perf testing
> 
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> ---
>  build.sh       | 1 +
>  helper/generic | 3 +++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/build.sh b/build.sh
> index 2f69bc0..58ff1b0 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -93,6 +93,7 @@ usage() {
>      echo -e "\tCLANG:\t\t build with clang, default: 0"
>      echo -e "\tEXIT_ON_ERROR:\t bail out on error, default: 1"
>      echo -e "\tCPP_TEST:\t enable cpp test, default: 0"
> +    echo -e "\tPERF_TEST:\t enable perf test, default: 1"

Maybe create a function with a sensible name in helper/generic and then
call that function here.

Don't forget to add it into apply-and-build as well.

And maybe someone can do a follow up patch and move the common usage to
this new function? =)

Cheers,
Anders
diff mbox

Patch

From fb7274ef5bd95e08136b1178eb72c009fe733702 Mon Sep 17 00:00:00 2001
From: Mike Holmes <mike.holmes@linaro.org>
Date: Thu, 14 May 2015 11:53:58 -0400
Subject: [PATCH] optional perf testing

Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 build.sh       | 1 +
 helper/generic | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/build.sh b/build.sh
index 2f69bc0..58ff1b0 100755
--- a/build.sh
+++ b/build.sh
@@ -93,6 +93,7 @@  usage() {
     echo -e "\tCLANG:\t\t build with clang, default: 0"
     echo -e "\tEXIT_ON_ERROR:\t bail out on error, default: 1"
     echo -e "\tCPP_TEST:\t enable cpp test, default: 0"
+    echo -e "\tPERF_TEST:\t enable perf test, default: 1"
     echo -e "\tDISTCHECK:\tset to 1 to enable DISTCHECK build, default: 0"
     echo -e "\tE_VALGRIND:\t run Valgrind, default: 0"
     ${PLATFORM_SHORT}_usage
diff --git a/helper/generic b/helper/generic
index aa1b10a..9d428a1 100644
--- a/helper/generic
+++ b/helper/generic
@@ -3,7 +3,10 @@ 
 export SRCDIR=${ROOT_DIR}/src
 export BUILDDIR=${ROOT_DIR}/build
 export LOGDIR=${ROOT_DIR}/log
+export PERF_TEST="${PERF_TEST:-1}"
+if [[ ${PERF_TEST} -eq 1 ]]; then
 export EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf"
+fi
 
 mkdir -p ${SRCDIR}
 mkdir -p ${BUILDDIR}
-- 
2.1.4