| Message ID | 1431635053-19970-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2015-05-14 16:24, Mike Holmes wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > --- > Uses patch enable optional perf testing > > apply-and-build.sh | 4 ---- > build.sh | 4 ---- > helper/generic | 4 ++++ > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/apply-and-build.sh b/apply-and-build.sh > index e41c297..0b2a301 100755 > --- a/apply-and-build.sh > +++ b/apply-and-build.sh > @@ -25,8 +25,6 @@ export DISTCHECK="${DISTCHECK:-1}" > > usage() { > echo -e "$0 makes use of the following environment variables," > - echo -e "\tGIT_ODP:\twhich ODP git repo to use, default: ${GIT_ODP}" > - echo -e "\tGIT_BRANCH:\twhich branch to checkout and test, default: ${GIT_BRANCH}" > echo -e "\tPATCH_DIR:\twhere to look for patches, default: $HOME/incoming" > echo -e "\tCLEANUP:\tset to 0 to save *.log files, default: ${CLEANUP}" > echo -e "\tCHECKPATCH:\tset to 0 to disable checkpatch test, default: ${CHECKPATCH}" > @@ -39,9 +37,7 @@ usage() { > echo -e "\tNUM_CPUS:\tadd parallel make, default: _NPROCESSORS_ONLN" > 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 > cunit_usage > diff --git a/build.sh b/build.sh > index 2bf2ac3..6dc081d 100755 > --- a/build.sh > +++ b/build.sh > @@ -76,8 +76,6 @@ exit_on_error(){ > > usage() { > echo -e "\tARCH:\t\t which arch to build (arm, armeb, arm64, arm64be), default: not set" > - echo -e "\tGIT_ODP:\t which ODP git repo to use, default: ${GIT_ODP}" > - echo -e "\tGIT_BRANCH:\t which branch to checkout and test, default: ${GIT_BRANCH}" > tc_usage > cunit_usage > openssl_usage > @@ -92,9 +90,7 @@ usage() { > echo -e "\tDOXYGEN_HTML:\t build doxygen-html, default: 0" > 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 d4be657..496148b 100644 > --- a/helper/generic > +++ b/helper/generic > @@ -23,7 +23,11 @@ control_c() > trap control_c SIGINT > > common_usage() { > + echo -e "\tGIT_ODP:\t which ODP git repo to use, default: ${GIT_ODP}" > + echo -e "\tGIT_BRANCH:\t which branch to checkout and test, default: ${GIT_BRANCH}" > + 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" > } > > remote_name(){ > -- > 2.1.4 > Applied. Cheers, Anders
diff --git a/apply-and-build.sh b/apply-and-build.sh index e41c297..0b2a301 100755 --- a/apply-and-build.sh +++ b/apply-and-build.sh @@ -25,8 +25,6 @@ export DISTCHECK="${DISTCHECK:-1}" usage() { echo -e "$0 makes use of the following environment variables," - echo -e "\tGIT_ODP:\twhich ODP git repo to use, default: ${GIT_ODP}" - echo -e "\tGIT_BRANCH:\twhich branch to checkout and test, default: ${GIT_BRANCH}" echo -e "\tPATCH_DIR:\twhere to look for patches, default: $HOME/incoming" echo -e "\tCLEANUP:\tset to 0 to save *.log files, default: ${CLEANUP}" echo -e "\tCHECKPATCH:\tset to 0 to disable checkpatch test, default: ${CHECKPATCH}" @@ -39,9 +37,7 @@ usage() { echo -e "\tNUM_CPUS:\tadd parallel make, default: _NPROCESSORS_ONLN" 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 cunit_usage diff --git a/build.sh b/build.sh index 2bf2ac3..6dc081d 100755 --- a/build.sh +++ b/build.sh @@ -76,8 +76,6 @@ exit_on_error(){ usage() { echo -e "\tARCH:\t\t which arch to build (arm, armeb, arm64, arm64be), default: not set" - echo -e "\tGIT_ODP:\t which ODP git repo to use, default: ${GIT_ODP}" - echo -e "\tGIT_BRANCH:\t which branch to checkout and test, default: ${GIT_BRANCH}" tc_usage cunit_usage openssl_usage @@ -92,9 +90,7 @@ usage() { echo -e "\tDOXYGEN_HTML:\t build doxygen-html, default: 0" 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 d4be657..496148b 100644 --- a/helper/generic +++ b/helper/generic @@ -23,7 +23,11 @@ control_c() trap control_c SIGINT common_usage() { + echo -e "\tGIT_ODP:\t which ODP git repo to use, default: ${GIT_ODP}" + echo -e "\tGIT_BRANCH:\t which branch to checkout and test, default: ${GIT_BRANCH}" + 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" } remote_name(){
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- Uses patch enable optional perf testing apply-and-build.sh | 4 ---- build.sh | 4 ---- helper/generic | 4 ++++ 3 files changed, 4 insertions(+), 8 deletions(-)