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.
commit 58ea108a2aa983fb2ba77a9641961587b6d91827
Author: Bernard Ogden <bernie.ogden(a)linaro.org>
Date: Fri Jul 31 12:21:40 2015 +0200
Refactor toolchain download/install code
Pull out into function, add capability to use scp, stop
changing dir as part of the toolchain install process.
Change-Id: I8f1831bbe1d2336aca006d234cc0a52c2860efbc
---
scripts/Benchmark.job | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/scripts/Benchmark.job b/scripts/Benchmark.job
index dcfa03e..dba2f0b 100755
--- a/scripts/Benchmark.job
+++ b/scripts/Benchmark.job
@@ -17,27 +17,39 @@ if test x"${benchmark:-}" = x; then
exit 1
fi
+function get_thing {
+ local thing="$1"
+ if echo x"${thing}" | grep -q '^xhttp'; then
+ wget -q "${thing}"
+ basename "${thing}"
+ else
+ (. host.conf; . "${abe_path}"/lib/remote.sh; remote_download "${prebuilt%%:*}" [...]
+ echo "${prebuilt#*:}"
+ fi
+}
+
#Set up maindir
echo "Building benchmark ${benchmark} in ${maindir}"
chmod 700 "${maindir}"
cd "${maindir}"
+#Configure
+#Must have run configure before first call to get_thing
+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
mkdir bin
-cd bin
-if echo x"${toolchain}" | grep -q '^xhttp'; then
- wget -q "${toolchain}"
- tar xf "`basename ${toolchain}`"
- #TODO: abe way to handle this?
- if test x"${toolchain##.tgz}" = x.tgz; then
- benchgccpath="`echo $PWD/\`basename ${toolchain%%.tgz}\`/bin/*gcc`"
- else
- benchgccpath="`echo $PWD/\`basename ${toolchain%%.tar.*}\`/bin/*gcc`"
- fi
-else
+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="`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
@@ -50,14 +62,6 @@ if test x"${benchgccpath}" != x; then
fi
fi
-#Run benchmark
-echo cd "${maindir}"
- cd "${maindir}"
-
-#Configure
-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 [...]
-
#Build
echo "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f \"${compi [...]
"${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${compi [...]
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
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.
commit f0f254ba9dfe0ba9066cf2df3aec91eb3034e1d2
Author: Bernard Ogden <bernie.ogden(a)linaro.org>
Date: Fri Jul 31 13:32:57 2015 +0200
Fix CLI-overriding of make_flags
Looks like this was just a typo - I guess there aren't any tests?
Change-Id: I31171dcbc4909758336c37cc7f548a7927fb0b4b
---
abe.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abe.sh b/abe.sh
index 193534f..a945bd6 100755
--- a/abe.sh
+++ b/abe.sh
@@ -497,7 +497,7 @@ set_package()
;;
makeflags|ma*)
# override_makeflags="${setting}"
- set make_flags="${make_flags} ${setting}"
+ make_flags="${make_flags} ${setting}"
notice "Overriding ${setting} to MAKEFLAGS"
return 0
;;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a change to branch bernie/benchmarking
in repository toolchain/abe.
discards 3dc75b2 Support makeflags in multinode jobs
discards 6cb6a65 Fix CLI-overriding of make_flags
discards ee3378b Permit benchmarking with prebuilt benchmark
discards 7e94353 Refactor toolchain download/install code
new 58ea108 Refactor toolchain download/install code
new 10998ec Permit benchmarking with prebuilt benchmark
new f0f254b Fix CLI-overriding of make_flags
new 8e8ee0e Support makeflags in multinode jobs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3dc75b2)
\
N -- N -- N refs/heads/bernie/benchmarking (8e8ee0e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omits" are not gone; other references still
refer to them. Any revisions marked "discards" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/Benchmark.job | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
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.
commit 6cb6a6547ec2a8cd04fd842d0796610b95f6950e
Author: Bernard Ogden <bernie.ogden(a)linaro.org>
Date: Fri Jul 31 13:32:57 2015 +0200
Fix CLI-overriding of make_flags
Looks like this was just a typo - I guess there aren't any tests?
Change-Id: I31171dcbc4909758336c37cc7f548a7927fb0b4b
---
abe.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abe.sh b/abe.sh
index 193534f..a945bd6 100755
--- a/abe.sh
+++ b/abe.sh
@@ -497,7 +497,7 @@ set_package()
;;
makeflags|ma*)
# override_makeflags="${setting}"
- set make_flags="${make_flags} ${setting}"
+ make_flags="${make_flags} ${setting}"
notice "Overriding ${setting} to MAKEFLAGS"
return 0
;;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
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.
commit 7e94353bd1a6c1ad9b7bafda659f418abdb2e861
Author: Bernard Ogden <bernie.ogden(a)linaro.org>
Date: Fri Jul 31 12:21:40 2015 +0200
Refactor toolchain download/install code
Pull out into function, add capability to use scp, stop
changing dir as part of the toolchain install process.
Change-Id: I8f1831bbe1d2336aca006d234cc0a52c2860efbc
---
scripts/Benchmark.job | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/scripts/Benchmark.job b/scripts/Benchmark.job
index dcfa03e..ae0370e 100755
--- a/scripts/Benchmark.job
+++ b/scripts/Benchmark.job
@@ -17,27 +17,39 @@ if test x"${benchmark:-}" = x; then
exit 1
fi
+function get_thing {
+ local thing="$1"
+ if echo x"${thing}" | grep -q '^xhttp'; then
+ wget -q "${thing}"
+ basename "${thing}"
+ else
+ (. host.conf; . "${abe_path}"/lib/remote.sh; remote_download "${prebuilt%%:*}" [...]
+ echo "${prebuilt#*:}"
+ fi
+}
+
#Set up maindir
echo "Building benchmark ${benchmark} in ${maindir}"
chmod 700 "${maindir}"
cd "${maindir}"
+#Configure
+#Must have run configure before first call to get_thing
+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
mkdir bin
-cd bin
-if echo x"${toolchain}" | grep -q '^xhttp'; then
- wget -q "${toolchain}"
- tar xf "`basename ${toolchain}`"
- #TODO: abe way to handle this?
- if test x"${toolchain##.tgz}" = x.tgz; then
- benchgccpath="`echo $PWD/\`basename ${toolchain%%.tgz}\`/bin/*gcc`"
- else
- benchgccpath="`echo $PWD/\`basename ${toolchain%%.tar.*}\`/bin/*gcc`"
- fi
-else
+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="`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
@@ -50,14 +62,6 @@ if test x"${benchgccpath}" != x; then
fi
fi
-#Run benchmark
-echo cd "${maindir}"
- cd "${maindir}"
-
-#Configure
-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 [...]
-
#Build
echo "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f \"${compi [...]
"${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${compi [...]
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a change to branch bernie/benchmarking
in repository toolchain/abe.
discards ae36051 Support makeflags in multinode jobs
discards 45dfbbe Fix CLI-overriding of make_flags
discards 335d1ed Permit benchmarking with prebuilt benchmark
discards 8c7e6d3 Refactor toolchain download/install code
new 7e94353 Refactor toolchain download/install code
new ee3378b Permit benchmarking with prebuilt benchmark
new 6cb6a65 Fix CLI-overriding of make_flags
new 3dc75b2 Support makeflags in multinode jobs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ae36051)
\
N -- N -- N refs/heads/bernie/benchmarking (3dc75b2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omits" are not gone; other references still
refer to them. Any revisions marked "discards" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/Benchmark.job | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
