This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch bernie/benchmarking in repository toolchain/abe.
The following commit(s) were added to refs/heads/bernie/benchmarking by this push: new 7241071 Only download/unpack toolchain if building benchmark 7241071 is described below
commit 72410713060c3d92785c8ef19f6d9927fc6ac782 Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu Aug 13 15:19:49 2015 +0200
Only download/unpack toolchain if building benchmark
Was previously hanging on to the toolchain so that infrastructure could do some analysis of binaries - mainly code size. But that should happen at build time, so not needed for prebuilt binaries.
Change-Id: I48e7076cdca367f698de3b498ecb99d329ca78ca --- scripts/Benchmark.job | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/scripts/Benchmark.job b/scripts/Benchmark.job index f95fb3b..5f94a0b 100755 --- a/scripts/Benchmark.job +++ b/scripts/Benchmark.job @@ -46,32 +46,32 @@ maindir="`pwd`" echo "${ABE_DIR}"/configure --with-fileserver=148.251.136.42 --with-remote-snapsho [...] "${ABE_DIR}"/configure --with-fileserver=148.251.136.42 --with-remote-snapsho [...]
-#Install toolchain - needed even for prebuilt case, so we can do analysis of binaries -mkdir bin -if test x"${toolchain:0:1}" = x/; then - echo "Toolchain assumed to be path on builder" - benchgccpath="${toolchain}" -else - tarball="`get_thing ${toolchain}`" - tar xf "${tarball}" -C bin - benchgccpath="`ls ${PWD}/bin/*/bin/*gcc`" - rm "${tarball}" -fi +#Install toolchain, or unpack prebuilt tarball +if test x"${prebuilt:-}" = x; then + mkdir bin + if test x"${toolchain:0:1}" = x/; then + echo "Toolchain assumed to be path on builder" + benchgccpath="${toolchain}" + else + tarball="`get_thing ${toolchain}`" + tar xf "${tarball}" -C bin + benchgccpath="`ls ${PWD}/bin/*/bin/*gcc`" + rm "${tarball}" + fi
-if test "`echo ${benchgccpath} | wc -w`" -ne 1; then - echo "Should be exactly one GCC path" 1>&2 - echo "Got: ${benchgccpath}" 1>&2 - exit 1 -fi -if test x"${benchgccpath}" != x; then - if ! test -x "${benchgccpath}"; then - echo "GCC binary '${benchgccpath}' does not exist or is not executable" 1>&2 + if test "`echo ${benchgccpath} | wc -w`" -ne 1; then + echo "Should be exactly one GCC path" 1>&2 + echo "Got: ${benchgccpath}" 1>&2 exit 1 fi -fi + if test x"${benchgccpath}" != x; then + if ! test -x "${benchgccpath}"; then + echo "GCC binary '${benchgccpath}' does not exist or is not executable" 1>&2 + exit 1 + fi + fi
-#Build -if test x"${prebuilt:-}" = x; then + #Build echo "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${com [...] "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${com [...] else