Update scripts from ABE. Merge remote-tracking branch 'jenkins-sh/master'

Change-Id: I8e66a03e2533620a6d941d2af4715502f87ef6d4

1 files changed, 39 insertions, 33 deletions

diff --git a/jenkins.sh b/jenkins.sh
index 0b41e5ed..34e80786 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -19,7 +19,7 @@ set -e
 set -o pipefail
 
 # Improve debug logs
-PRGNAME=`basename $0`
+PRGNAME=$(basename $0)
 PS4='+ $PRGNAME: ${FUNCNAME+"$FUNCNAME : "}$LINENO: '
 
 usage()
@@ -42,7 +42,7 @@ abe_dir=
 
 # This is where all the builds go
 if test x"${WORKSPACE}" = x; then
-    WORKSPACE="`pwd`"
+    WORKSPACE="$(pwd)"
 fi
 user_workspace="${WORKSPACE}"
 
@@ -67,6 +67,9 @@ logname=""
 # Compiler languages to build
 languages=default
 
+# Whether to run tests
+runtests=false
+
 # Target to build for
 target=""
 
@@ -97,7 +100,7 @@ rebuild=true
 
 orig_parameters="$@"
 
-OPTS="`getopt -o s:g:w:o:l:rt:b:h -l override:,gcc-branch:,snapshots:,gitrepo:,abedir:,workspace:,options:,logserver:,logname:,languages:,runtests,target:,testcontainerfile:,bootstrap,help,excludecheck:,norebuild,extraconfig: -- "$@"`"
+OPTS="$(getopt -o s:g:w:o:l:rt:b:h -l override:,gcc-branch:,snapshots:,gitrepo:,abedir:,workspace:,options:,logserver:,logname:,languages:,runtests,target:,testcontainerfile:,bootstrap,help,excludecheck:,norebuild,extraconfig: -- "$@")"
 while test $# -gt 0; do
     case $1 in
 	--gcc-branch) change="$change gcc=$2"; shift ;;
@@ -129,14 +132,14 @@ fi
 
 # Non matrix builds use node_selector, but matrix builds use NODE_NAME
 if test x"${node_selector}" != x; then
-    node="`echo ${node_selector} | tr '-' '_'`"
+    node="$(echo ${node_selector} | tr '-' '_')"
     job=${JOB_NAME}
 else
-    node="`echo ${NODE_NAME} | tr '-' '_'`"
-    job="`echo ${JOB_NAME}  | cut -d '/' -f 1`"
+    node="$(echo ${NODE_NAME} | tr '-' '_')"
+    job="$(echo ${JOB_NAME}  | cut -d '/' -f 1)"
 fi
 
-arch="`uname -m`"
+arch="$(uname -m)"
 
 if [ x"$logserver" = x"" -a x"$logname" != x"" ]; then
     echo "ERROR: \$logname is not provided, but \$logserver is set to $logserver"
@@ -218,12 +221,12 @@ done
 # Test the config parameters from the Jenkins Build Now page
 
 # See if we're supposed to build a source tarball
-if test x"${tarsrc}" = xtrue -o "`echo $user_options | grep -c -- --tarsrc`" -gt 0; then
+if test x"${tarsrc}" = xtrue -o "$(echo $user_options | grep -c -- --tarsrc)" -gt 0; then
     tars="--tarsrc"
 fi
 
 # See if we're supposed to build a binary tarball
-if test x"${tarbin}" = xtrue -o "`echo $user_options | grep -c -- --tarbin`" -gt 0; then
+if test x"${tarbin}" = xtrue -o "$(echo $user_options | grep -c -- --tarbin)" -gt 0; then
     tars="${tars} --tarbin "
 fi
 
@@ -231,8 +234,8 @@ fi
 if ! test x"${release}" = xsnapshot -o x"${release}"; then
     releasestr="--release ${release}"
 fi
-if test "`echo $user_options | grep -c -- --release`" -gt 0; then
-    release="`echo  $user_options | grep -o -- "--release [a-zA-Z0-9]* " | cut -d ' ' -f 2`"
+if test "$(echo $user_options | grep -c -- --release)" -gt 0; then
+    release="$(echo  $user_options | grep -o -- "--release [a-zA-Z0-9]* " | cut -d ' ' -f 2)"
     releasestr="--release ${release}"
 fi
 
@@ -295,16 +298,16 @@ fi
 # Download QEMU provided by Peter Maydell.
 # The tarball has README with version information.
 if [ x"$(uname -m)" = x"x86_64" ]; then
-    wget http://people.linaro.org/~maxim.kuvyrkov/qemu-20160707.tgz
+    wget --progress=dot:giga http://people.linaro.org/~maxim.kuvyrkov/qemu-20160707.tgz
     tar xf qemu-20160707.tgz
-    export PATH="`pwd`/qemu-wip:$PATH"
+    export PATH="$(pwd)/qemu-wip:$PATH"
     for i in aarch64 arm armeb; do
 	qemu-$i --version
     done
 fi
 
 # Print some information about the build machine
-echo Running on `hostname`
+echo Running on $(hostname)
 uname -a
 lsb_release -a
 cat /proc/cpuinfo
@@ -356,7 +359,7 @@ if test $ret -gt 0; then
 fi
 
 # if runtests is true, then run make check after the build completes
-if test x"${runtests}" = xtrue; then
+if $runtests; then
     # check that expect is working, and dump some debug info then exit if not
     if ! echo "spawn true" | /usr/bin/expect -f - >/dev/null; then
         echo "expect cannot spawn processes. Aborting make check."
@@ -417,14 +420,14 @@ License-Type: open
 EOF
 
 if test x"${tars}" = x; then
-    # date="`${gcc} --version | head -1 | cut -d ' ' -f 4 | tr -d ')'`"
-    date="`date +%Y%m%d`"
+    # date="$(${gcc} --version | head -1 | cut -d ' ' -f 4 | tr -d ')')"
+    date="$(date +%Y%m%d)"
 else
     date=${release}
 fi
 
 # Setup the remote directory for tcwgweb
-xgcc="`find ${user_workspace} -name xgcc`"
+xgcc="$(find ${user_workspace} -name xgcc)"
 
 # If we can't find GCC, our build failed, so don't continue
 if test x"${xgcc}" = x; then
@@ -444,7 +447,7 @@ fi
 
 echo "Build by ${requestor} on ${NODE_NAME} with parameters: $orig_parameters"
 
-manifest="`find ${user_workspace}/_build/builds/ -name destdir -prune -o -name \*manifest.txt -print`"
+manifest="$(find ${user_workspace}/_build/builds/ -name destdir -prune -o -name \*manifest.txt -print)"
 if test x"${manifest}" != x; then
     echo "node=${node}" >> ${manifest}
     echo "requestor=${requestor}" >> ${manifest}
@@ -471,11 +474,11 @@ if test x"${logserver}" != x""; then
 # way to get the results into Jenkins.
 #if test x"${sums}" != x; then
 #    for i in ${sums}; do
-#	name="`basename $i`"
+#	name="$(basename $i)"
 #	${abe_dir}/sum2junit.sh $i $user_workspace/${name}.junit
 #	cp $i ${user_workspace}/results/${dir}
 #    done
-#    junits="`find ${user_workspace} -name *.junit`"
+#    junits="$(find ${user_workspace} -name *.junit)"
 #    if test x"${junits}" = x; then
 #	echo "Bummer, no junit files yet..."
 #    fi
@@ -486,18 +489,18 @@ if test x"${logserver}" != x""; then
 fi
 
 # Find all the test result files.
-sums="`find ${user_workspace} -name \*.sum -not -path "*/gdb/testsuite/outputs/*"`"
+sums="$(find ${user_workspace} -name \*.sum -not -path "*/gdb/testsuite/outputs/*")"
 
 # Canadian Crosses are a win32 hosted cross toolchain built on a Linux
 # machine.
 if test x"${canadian}" = x"true"; then
-    $CONFIG_SHELL ${abe_dir}/abe.sh --disable update --nodepends ${change} ${platform} --build all
-    distro="`lsb_release -sc`"
+    $CONFIG_SHELL ${abe_dir}/abe.sh --disable update ${change} ${platform} --build all
+    distro="$(lsb_release -sc)"
     # Ubuntu Lucid uses an older version of Mingw32
     if test x"${distro}" = x"lucid"; then
-	$CONFIG_SHELL ${abe_dir}/abe.sh --disable update --nodepends ${change} ${tars} --host=i586-mingw32msvc ${platform} --build all
+	$CONFIG_SHELL ${abe_dir}/abe.sh --disable update ${change} ${tars} --host=i586-mingw32msvc ${platform} --build all
     else
-	$CONFIG_SHELL ${abe_dir}/abe.sh --disable update --nodepends ${change} ${tars} --host=i686-w64-mingw32 ${platform} --build all
+	$CONFIG_SHELL ${abe_dir}/abe.sh --disable update ${change} ${tars} --host=i686-w64-mingw32 ${platform} --build all
     fi
 fi
 
@@ -514,16 +517,19 @@ if test x"${logserver}" != x"" && test x"${sums}" != x -o x"${runtests}" != x"tr
 	cp ${sums} ${test_logs} ${logs_dir}/ || status=1
 	
 	# Copy over the logs from make check, which we need to find testcase errors.
-	checks="`find ${user_workspace} -name check\*.log`"
+	checks="$(find ${user_workspace} -name check\*.log)"
 	cp ${checks} ${logs_dir}/ || status=1
     fi
 
     # Copy over the build logs
-    logs="`find ${user_workspace} -name make\*.log`"
+    logs="$(find ${user_workspace} -name make\*.log)"
     cp ${logs} ${logs_dir}/ || status=1
 
     # Copy stdout and stderr output from abe.
-    cp build.out build.err check.out check.err ${logs_dir}/ || status=1
+    cp build.out build.err ${logs_dir}/ || status=1
+    if $runtests; then
+	cp check.out check.err ${logs_dir}/ || status=1
+    fi
 
     xz ${logs_dir}/* || status=1
     scp ${logs_dir}/* ${logserver}:${basedir}/${dir}/ || status=1
@@ -532,15 +538,15 @@ if test x"${logserver}" != x"" && test x"${sums}" != x -o x"${runtests}" != x"tr
     echo "Uploaded test results and build logs to ${logserver}:${basedir}/${dir}/ with status: $status"
 
     if test x"${tarsrc}" = xtrue -a x"${release}" != x; then
-	allfiles="`ls ${user_snapshots}/*${release}*.xz`"
-	srcfiles="`echo ${allfiles} | egrep -v "arm|aarch"`"
+	allfiles="$(ls ${user_snapshots}/*${release}*.xz)"
+	srcfiles="$(echo ${allfiles} | egrep -v "arm|aarch")"
 	scp ${srcfiles} ${logserver}:/home/abe/var/snapshots/ || status=1
 	rm -f ${srcfiles} || status=1
     fi
 
     if test x"${tarbin}" = xtrue -a x"${release}" != x; then
-	allfiles="`ls ${user_snapshots}/*${release}*.xz`"
-	binfiles="`echo ${allfiles} | egrep "arm|aarch"`"
+	allfiles="$(ls ${user_snapshots}/*${release}*.xz)"
+	binfiles="$(echo ${allfiles} | egrep "arm|aarch")"
 	scp ${binfiles} ${logserver}:/work/space/binaries/ || status=1
 	rm -f ${binfiles} || status=1
     fi