This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "ABE".
The branch, bernie/benchmarking has been updated discards 59e7985181ad89ab8b30c905cb477235cb764eb7 (commit) discards a7ee16591120dcf47e1d54687f4646bacdeaf953 (commit) discards 741828f6c4c919ab16ee3c1cd37dc611aacc242a (commit) discards 279a031a7678cf5b1f3ddec3ae897af3e273c4fc (commit) discards 57ef5031aa5d07f5af4937586a72caa0121fbdca (commit) discards 8a2736ae2903ce0a5797b8e9134cbd575e105f10 (commit) via 4060ddfc3bd29aa2b5acbcad966eb5e8a13cbe9b (commit) via 553c3761781f5e042c8178cb81f831630369e8a1 (commit) via edc92a6c6c90db16c5bc35cc521904335f9ae08d (commit) via 1f29382fa4ad20a41f89220252604aaa9cea4247 (commit) via 59a0f501c4070f2bdb9afe6c9f855cfad9b9df06 (commit)
This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this:
* -- * -- B -- O -- O -- O (59e7985181ad89ab8b30c905cb477235cb764eb7) \ N -- N -- N (4060ddfc3bd29aa2b5acbcad966eb5e8a13cbe9b)
When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B.
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 4060ddfc3bd29aa2b5acbcad966eb5e8a13cbe9b Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:53:39 2015 +0200
--no-print-directory now handled by SPEC sources
Change-Id: I83179b44402ef6d9ac87ca303f3c95b2fd01d9c5
diff --git a/config/CPU2000.conf b/config/CPU2000.conf index b361aa6..b0bc925 100644 --- a/config/CPU2000.conf +++ b/config/CPU2000.conf @@ -4,12 +4,7 @@ depends="" # spec does not have a configure script configure="no"
-#Note that the makefile will cross-compile the benchmark, but only ever natively compiles the tools -#--no-print-directory is important, as we otherwise catch paths as part of the checksum that identifies -#whether the build options have changed. This is a problem when cross-building. Or even when native -#building and passing the results around, which appears to be an expected (supported?) use case, see -#http://www.spec.org/cpu2006/docs/runspec.html#section3.1.1 -default_makeflags="BUILD=${build} --no-print-directory" +default_makeflags="BUILD=${build}" if test x"${build}" = x"${target}"; then default_makeflags="${default_makeflags} CROSS_COMPILE=" else diff --git a/config/CPU2006.conf b/config/CPU2006.conf index b361aa6..b0bc925 100644 --- a/config/CPU2006.conf +++ b/config/CPU2006.conf @@ -4,12 +4,7 @@ depends="" # spec does not have a configure script configure="no"
-#Note that the makefile will cross-compile the benchmark, but only ever natively compiles the tools -#--no-print-directory is important, as we otherwise catch paths as part of the checksum that identifies -#whether the build options have changed. This is a problem when cross-building. Or even when native -#building and passing the results around, which appears to be an expected (supported?) use case, see -#http://www.spec.org/cpu2006/docs/runspec.html#section3.1.1 -default_makeflags="BUILD=${build} --no-print-directory" +default_makeflags="BUILD=${build}" if test x"${build}" = x"${target}"; then default_makeflags="${default_makeflags} CROSS_COMPILE=" else
commit 553c3761781f5e042c8178cb81f831630369e8a1 Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri May 15 05:16:56 2015 -0600
Use nc.traditional if available
nc.traditional seems more reliable than nc.openbsd - in particular, it always seems to get messages sent for it. The only drawback seems to be that it always exits when the current connection closes. We already cope with this limitation to support nc.traditional at all.
Change-Id: I3fb90c548bfad88fd0fdd2151f1c74c4d81c69e8
diff --git a/scripts/establish_listener.sh b/scripts/establish_listener.sh index 88d7844..5266faa 100755 --- a/scripts/establish_listener.sh +++ b/scripts/establish_listener.sh @@ -108,10 +108,10 @@ for ((listener_port=${start_port}; listener_port < ${end_port}; listener_port++) #Try to listen on the port. nc will fail if something has snatched it. echo "Attempting to establish listener on ${listener_addr}:${listener_port}" 1>&2
- if test -e /bin/nc.openbsd; then - /bin/nc.openbsd -l "${listener_addr}" "${listener_port}" >> "${listener_file}"& - elif test -e /bin/nc.traditional; then + if test -e /bin/nc.traditional; then /bin/nc.traditional -l -s "${listener_addr}" -p "${listener_port}" >> "${listener_file}"& + elif test -e /bin/nc.openbsd; then + /bin/nc.openbsd -l "${listener_addr}" "${listener_port}" >> "${listener_file}"& else echo "Unable to identify netcat" 1>&2 exit 1
commit edc92a6c6c90db16c5bc35cc521904335f9ae08d Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:46:28 2015 +0200
Set gateway to target if there is no gateway
Change-Id: I8579588acba56b72e15d382d1a1ff4f07ce7e148
diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index 88397b5..003ed64 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -219,7 +219,9 @@ if test $? -eq 0; then echo "+++ Failed to acquire LAVA target ${lava_target}" 1>&2 exit 1 fi -else +fi + +if test -z "${gateway:-}"; then gateway="${ip/*@}" fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread
commit 1f29382fa4ad20a41f89220252604aaa9cea4247 Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:45:45 2015 +0200
Ensure SSH key is specified in all code paths
Change-Id: I91a3cb88b1f722c8519f448b4810a4bbe464b386
diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index 40c3e60..88397b5 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -161,6 +161,7 @@ clean_benchmark() exit "${error}" }
+ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}}" establish_listener_opts=
#Handle LAVA case @@ -177,7 +178,7 @@ if test $? -eq 0; then 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; 1) gateway=lab.validation.linaro.org - ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" + ssh_opts="${ssh_opts} ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}"
#LAVA targets need to boot - do an early check that the route to the gateway is private, so that we can fail fast @@ -220,7 +221,6 @@ if test $? -eq 0; then fi else gateway="${ip/*@}" - ssh_opts= fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread #monitoring of the LAVA process while we're waiting for the benchmark to end
commit 59a0f501c4070f2bdb9afe6c9f855cfad9b9df06 Author: Bernard Ogden bernie.ogden@linaro.org Date: Mon May 11 07:57:59 2015 -0600
Allow user to declare that script's running in lab
This overrides checks as to where we are.
Change-Id: Icda428c878001e284b89a1dae55e8b34e1f96cab
diff --git a/scripts/lava.sh b/scripts/lava.sh index 7064354..8bdc639 100755 --- a/scripts/lava.sh +++ b/scripts/lava.sh @@ -221,8 +221,12 @@ sed -i "s+^(.*"job_name":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "${lava sed -i "s+^(.*"server":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "https://%24%7Blava_user%7D@%24%7Blava_server%7D%5C%22%5C2+" "${json_copy}" sed -i "s+^(.*"stream":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "/private/personal/${lava_user}/"\2+" "${json_copy}"
-lava_network "${lava_user}" -in_lab=$? +if test -z "${LAVA_IN_LAB}"; then + lava_network "${lava_user}" + in_lab=$? +else + in_lab=0 +fi if test ${in_lab} -eq 2; then echo "Unable to determine whether I am inside the LAVA lab, assuming that I am not" 1>&2 fi diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index b979d5e..40c3e60 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -161,6 +161,8 @@ clean_benchmark() exit "${error}" }
+establish_listener_opts= + #Handle LAVA case echo "${ip}" | grep '.json$' > /dev/null if test $? -eq 0; then @@ -169,21 +171,22 @@ if test $? -eq 0; then echo "Unable to find username from ${lava_url}" 1>&2 exit 1 fi - lava_network "${lava_user}" - case $? in - 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; - 1) - gateway=lab.validation.linaro.org - ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" - establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" - - #LAVA targets need to boot - do an early check that the route to the gateway is private, so that we can fail fast - if ! check_private_route "${gateway}"; then - echo "Failed to confirm that route to target is private, conservatively aborting" 1>&2 - exit 1 - fi - esac - + if test -z "${LAVA_IN_LAB}"; then + lava_network "${lava_user}" + case $? in + 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; + 1) + gateway=lab.validation.linaro.org + ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" + establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" + + #LAVA targets need to boot - do an early check that the route to the gateway is private, so that we can fail fast + if ! check_private_route "${gateway}"; then + echo "Failed to confirm that route to target is private, conservatively aborting" 1>&2 + exit 1 + fi + esac + fi lava_target="${ip}" ip='' tee_output=/dev/console @@ -218,7 +221,6 @@ if test $? -eq 0; then else gateway="${ip/*@}" ssh_opts= - establish_listener_opts= fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread #monitoring of the LAVA process while we're waiting for the benchmark to end
-----------------------------------------------------------------------
Summary of changes: scripts/benchmark.sh | 7 +++++++ scripts/benchutil.sh | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ scripts/runbenchmark.sh | 15 +++++++++++++ 3 files changed, 78 insertions(+)
hooks/post-receive