diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2018-03-13 22:32:53 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2018-03-23 09:29:09 +0000 |
| commit | 0cb84d72a6f63b4079af04e98a7aec82dccb1a02 (patch) | |
| tree | 9fd9f223f2be7a74f6d975059de7c8f35d5ecce0 | |
| parent | 0409c1fd37757671391a48e31b99182007b5fc79 (diff) | |
Improve results summary.
* Use svn revision if present, to be in sync with reports from other
contributors.
* Workaround a test_summary bug, which is confused if the path to
configure is quoted in TOPLEVEL_CONFIGURE_ARGUMENTS in
config.status. This happens for instance because ABE uses '~' in
srcdir:
S["TOPLEVEL_CONFIGURE_ARGUMENTS"]="'/home/christophe.lyon/mybuild/snapshots/gcc.git~linaro~gcc-7-branch/configure' SHELL=/bin/bash --with-mpc=/home/"
Change-Id: Ia764aff0fc247a1d9fc3560b3b115f024ec307f2
| -rw-r--r-- | lib/checkout.sh | 10 | ||||
| -rwxr-xr-x | lib/make.sh | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/checkout.sh b/lib/checkout.sh index e404439b..bcbd2a08 100644 --- a/lib/checkout.sh +++ b/lib/checkout.sh @@ -247,10 +247,14 @@ checkout() # Touch GCC's auto-generated files to avoid non-deterministic # build behavior. dryrun "(cd ${srcdir} && ./contrib/gcc_update --touch)" - # LAST_UPDATED and gcc/REVISION are used when send + # LAST_UPDATED and gcc/REVISION are used when sending # results summaries - dryrun "echo $(TZ=UTC date) '(revision' ${newrev}')' | tee ${srcdir}/LAST_UPDATED" - dryrun "echo \[${branch} revision ${newrev}\] | tee ${srcdir}/gcc/REVISION" + # Report svn revision, if present + local svnrev="$(git -C ${srcdir} log -n 1 | grep git-svn-id: | awk '{print $2;}' | cut -d@ -f2)" + local revstring="${newrev}" + [ x"${svnrev}" != x ] && revstring="${svnrev}" + dryrun "echo $(TZ=UTC date) '(revision' ${revstring}')' | tee ${srcdir}/LAST_UPDATED" + dryrun "echo \[${branch} revision ${revstring}\] | tee ${srcdir}/gcc/REVISION" ;; *) # Avoid rebuilding of auto-generated C files. Rather than diff --git a/lib/make.sh b/lib/make.sh index ada20f54..09b66578 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -835,6 +835,12 @@ make_check() # via email if [ x"$send_results_to" != x ]; then local srcdir="$(get_component_srcdir ${component})" + # Hack: Remove single quotes (octal 047) in + # TOPLEVEL_CONFIGURE_ARGUMENTS line in config.status, + # to avoid confusing test_summary. Quotes are added by + # configure when srcdir contains special characters, + # including '~' which ABE uses. + dryrun "(cd ${builddir} && sed -i -e '/TOPLEVEL_CONFIGURE_ARGUMENTS/ s/\o047//g' config.status)" dryrun "(cd ${builddir} && ${srcdir}/contrib/test_summary -t -m ${send_results_to} | sh)" fi fi |