| Message ID | 1431631325-1606-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | New |
| Headers | show |
I've tested it as well: Reviewed-by: Zoltan Kiss <zoltan.kiss@linaro.org> On 14/05/15 20:22, Mike Holmes wrote: > Signed-off-by: Mike Holmes<mike.holmes@linaro.org> > --- > apply-and-build.sh | 1 + > build.sh | 1 + > helper/generic | 9 ++++++++- > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/apply-and-build.sh b/apply-and-build.sh > index 9d73a2f..e41c297 100755 > --- a/apply-and-build.sh > +++ b/apply-and-build.sh > @@ -40,6 +40,7 @@ usage() { > echo -e "\tFILE_EXT:\tsupported extensions in patch file names, default: ${FILE_EXT}" > echo -e "\tM32_ON_64:\tenable 32 bit builds on a 64 bit host, default: 0" > echo -e "\tCPP_TEST:\tenable cpp test, default: 0" > + common_usage > echo -e "\tDISTCHECK:\tset to 0 to disable DISTCHECK build, default: 1" > openssl_usage > tc_usage > diff --git a/build.sh b/build.sh > index 2f69bc0..2bf2ac3 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" > + common_usage > 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..d4be657 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 EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf" > +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} > @@ -19,6 +22,10 @@ control_c() > # trap keyboard interrupt (control-c) > trap control_c SIGINT > > +common_usage() { > + echo -e "\tPERF_TEST:\t enable perf test, default: 1" > +} > + > remote_name(){ > retval=$(echo ${1} |tr ':/.-' '_') > echo "${retval}" > -- 2.1.4 >
On 2015-05-20 17:18, Zoltan Kiss wrote: > I've tested it as well: > > Reviewed-by: Zoltan Kiss <zoltan.kiss@linaro.org> > > On 14/05/15 20:22, Mike Holmes wrote: > >Signed-off-by: Mike Holmes<mike.holmes@linaro.org> > >--- > > apply-and-build.sh | 1 + > > build.sh | 1 + > > helper/generic | 9 ++++++++- > > 3 files changed, 10 insertions(+), 1 deletion(-) > > > >diff --git a/apply-and-build.sh b/apply-and-build.sh > >index 9d73a2f..e41c297 100755 > >--- a/apply-and-build.sh > >+++ b/apply-and-build.sh > >@@ -40,6 +40,7 @@ usage() { > > echo -e "\tFILE_EXT:\tsupported extensions in patch file names, default: ${FILE_EXT}" > > echo -e "\tM32_ON_64:\tenable 32 bit builds on a 64 bit host, default: 0" > > echo -e "\tCPP_TEST:\tenable cpp test, default: 0" > >+ common_usage > > echo -e "\tDISTCHECK:\tset to 0 to disable DISTCHECK build, default: 1" > > openssl_usage > > tc_usage > >diff --git a/build.sh b/build.sh > >index 2f69bc0..2bf2ac3 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" > >+ common_usage > > 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..d4be657 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 EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf" Did a minor fixup, export EXTRA_FLAGS="${EXTRA_FLAGS:-}" Applied, Cheers, Anders
diff --git a/apply-and-build.sh b/apply-and-build.sh index 9d73a2f..e41c297 100755 --- a/apply-and-build.sh +++ b/apply-and-build.sh @@ -40,6 +40,7 @@ usage() { echo -e "\tFILE_EXT:\tsupported extensions in patch file names, default: ${FILE_EXT}" echo -e "\tM32_ON_64:\tenable 32 bit builds on a 64 bit host, default: 0" echo -e "\tCPP_TEST:\tenable cpp test, default: 0" + common_usage echo -e "\tDISTCHECK:\tset to 0 to disable DISTCHECK build, default: 1" openssl_usage tc_usage diff --git a/build.sh b/build.sh index 2f69bc0..2bf2ac3 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" + common_usage 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..d4be657 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 EXTRA_FLAGS="${EXTRA_FLAGS} --enable-test-perf" +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} @@ -19,6 +22,10 @@ control_c() # trap keyboard interrupt (control-c) trap control_c SIGINT +common_usage() { + echo -e "\tPERF_TEST:\t enable perf test, default: 1" +} + remote_name(){ retval=$(echo ${1} |tr ':/.-' '_') echo "${retval}"
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- apply-and-build.sh | 1 + build.sh | 1 + helper/generic | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-)