abuild: add a command line parameter for junit filename

The 'what-jenkins-does' makefile target was renaming the junit filename
after abuild finished.  Instead, just add a command line parameter to
send it to a different filename.

Change-Id: I66f7d80d621573d77a5154f36f2db49d7b2e948a
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/11878
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Martin Roth 2015-10-13 12:27:56 -06:00 committed by Patrick Georgi
parent cd32da425c
commit 21ca9beda4
1 changed files with 6 additions and 4 deletions

View File

@ -16,8 +16,8 @@
#set -x # Turn echo on....
ABUILD_DATE="May 21, 2014"
ABUILD_VERSION="0.9.3"
ABUILD_DATE="Oct 13, 2015"
ABUILD_VERSION="0.9.4"
TOP=$PWD
@ -419,6 +419,7 @@ Options:\n"
[-L|--clang] Use clang
[-x|--chromeos] Build with CHROMEOS enabled
Skip boards without Chrome OS support
[-X|--xmlfile <name>] set JUnit XML log file filename
[--scan-build] use clang's static analyzer
[cbroot] absolute path to coreboot sources
(defaults to $ROOT)
@ -462,11 +463,11 @@ cmdline="$* -c 1"
getoptbrand="`getopt -V`"
if [ "${getoptbrand:0:6}" == "getopt" ]; then
# Detected GNU getopt that supports long options.
args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,test,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos -o Vvqhat:p:Tc:sJCl:rP:uyBLzo:x -- "$@"` || exit 1
args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,test,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile: -o Vvqhat:p:Tc:sJCl:rP:uyBLzo:xX: -- "$@"` || exit 1
eval set -- $args
else
# Detected non-GNU getopt
args=`getopt Vvqhat:p:Tc:sJCl:rP:uyBLzo:x $*`
args=`getopt Vvqhat:p:Tc:sJCl:rP:uyBLzo:xX: $*`
set -- $args
fi
@ -544,6 +545,7 @@ while true ; do
customizing="${customizing}, chrome os"
configoptions="${configoptions}CONFIG_CHROMEOS=y\n"
;;
-X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;;
--) shift; break;;
-*) printf "Invalid option\n\n"; myhelp; exit 1;;
*) break;;