X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=8b81ea17fc9b6ffdbbbd80a9199f4bc3236d7698;hb=643c9e892fab5f73dde566b9ffb73f2f0463d9a7;hp=2040709cd7ced23059b41ff17ea598ff640d035f;hpb=478b77d3884f8c1ca54144380a417ba7a73162ea;p=coreboot.git
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 2040709cd..8b81ea17f 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -17,9 +17,12 @@
ABUILD_DATE="December 10th, 2010"
ABUILD_VERSION="0.9.1"
+TOP=$PWD
+
# Where shall we place all the build trees?
TARGET=coreboot-builds
-XMLFILE=$( pwd )/abuild.xml
+XMLFILE=$TOP/abuild.xml
+REAL_XMLFILE=$XMLFILE
# path to payload. Should be more generic
PAYLOAD=/dev/null
@@ -35,6 +38,9 @@ cpus=1
# Configure-only mode
configureonly=0
+# Did any board fail to build?
+failed=0
+
# One might want to adjust these in case of cross compiling
for i in make gmake gnumake nonexistant_make; do
$i --version 2>/dev/null |grep "GNU Make" >/dev/null && break
@@ -106,6 +112,20 @@ function xmlfile
} >> $XMLFILE
}
+function junit
+{
+ test "$mode" == "junit" && printf "$*\n" >> $XMLFILE
+ return 0
+}
+
+function junitfile
+{
+ test "$mode" == "junit" && {
+ printf '\n'
+ } >> $XMLFILE
+}
function vendors
@@ -205,7 +225,7 @@ function create_config
fi
fi
- #yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
+ #yes "" | $MAKE oldconfig obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
yes "" | $MAKE oldconfig DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
ret=$?
if [ $ret -eq 0 ]; then
@@ -269,15 +289,16 @@ function compile_target
CURR=$( pwd )
#stime=`perl -e 'print time();' 2>/dev/null || date +%s`
build_dir=$TARGET/${VENDOR}_${MAINBOARD}
- eval $MAKE $silent -j $cpus DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \
+ eval $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \
&> ${build_dir}/make.log
ret=$?
- mv .xcompile ${build_dir}/xcompile.build
+ cp .xcompile ${build_dir}/xcompile.build
cd $TARGET/${VENDOR}_${MAINBOARD}
etime=`perl -e 'print time();' 2>/dev/null || date +%s`
duration=$(( $etime - $stime ))
xml " ${duration}s"
+ junit " "
xml " "
xmlfile make.log
@@ -285,15 +306,22 @@ function compile_target
if [ $ret -eq 0 ]; then
xml " ok"
+ junit ""
+ junitfile make.log
+ junit ""
printf "ok\n" > compile.status
printf "ok. (took ${duration}s)\n"
cd $CURR
return 0
else
xml " failed"
+ junit ""
+ junitfile make.log
+ junit ""
printf "FAILED after ${duration}s!\nLog excerpt:\n"
tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
cd $CURR
+ failed=1
return 1
fi
}
@@ -338,6 +366,7 @@ function build_target
HOSTCC='gcc'
printf "Building $VENDOR/$MAINBOARD; "
+ XMLFILE=$TOP/$TARGET/${VENDOR}_${MAINBOARD}/abuild.xml
xml ""
xml ""
@@ -381,6 +410,9 @@ function build_target
xml ""
xml ""
+ junit " "
+ junit "No cross-compiler for $TARCH found"
+
return 0
else
printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n"
@@ -404,6 +436,8 @@ function build_target
xml " knownbroken"
xml ""
xml ""
+ junit " "
+ junit "Board is marked as broken"
return 0
}
@@ -428,6 +462,7 @@ function build_target
xml ""
xml ""
+ junit ""
printf "\n"
}
@@ -507,6 +542,8 @@ function myhelp
printf " [-h|--help] print this help and exit\n"
printf " [-x|--xml] write xml log file \n"
printf " (defaults to $XMLFILE)\n"
+ printf " [-J|--junit] write JUnit formatted xml log file \n"
+ printf " (defaults to $XMLFILE)\n"
printf " [-T|--test] submit image(s) to automated test system\n"
printf " [-c|--cpus ] build on at the same time\n"
printf " [-s|--silent] omit compiler calls in logs\n"
@@ -550,11 +587,11 @@ test "$ROOT" = "" && ROOT=$( cd ../..; pwd )
getoptbrand="`getopt -V`"
if [ "${getoptbrand:0:6}" == "getopt" ]; then
# Detected GNU getopt that supports long options.
- args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sxCl:rP:uy -- "$@"`
+ args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sJxCl:rP:uy -- "$@"`
eval set -- $args
else
# Detected non-GNU getopt
- args=`getopt Vvhat:bp:Tc:sxCl:rP:uy $*`
+ args=`getopt Vvhat:bp:Tc:sJxCl:rP:uy $*`
set -- $args
fi
@@ -566,6 +603,7 @@ fi
while true ; do
case "$1" in
-x|--xml) shift; mode=xml; rm -f $XMLFILE ;;
+ -J|--junit) shift; mode=junit; rm -f $XMLFILE ;;
-t|--target) shift; target="$1"; shift;;
-a|--all) shift; buildall=true;;
-b|--broken) shift; buildbroken=true;;
@@ -590,6 +628,10 @@ while true ; do
esac
done
+if [ "$cpus" != "1" ]; then
+ export MAKEFLAGS="-j $cpus"
+fi
+
# /path/to/freebios2/
test -z "$1" || ROOT=$1
@@ -598,6 +640,9 @@ debug "ROOT=$ROOT"
xml ''
xml ''
+junit ''
+junit ''
+
if [ "$target" != "" ]; then
# build a single board
VENDOR=`printf $target|cut -f1 -d/`
@@ -606,10 +651,13 @@ if [ "$target" != "" ]; then
if [ ! -r $ROOT/src/mainboard/$target ]; then
printf "No such target: $target\n"
xml ''
+ junit ''
exit 1
fi
build_target $VENDOR $MAINBOARD $CONFIG
test_target $VENDOR $MAINBOARD
+ cat $TARGET/${VENDOR}_${MAINBOARD}/abuild.xml >> $REAL_XMLFILE
+ XMLFILE=$REAL_XMLFILE
else
# build all boards per default
for VENDOR in $( vendors ); do
@@ -619,6 +667,12 @@ else
remove_target $VENDOR $MAINBOARD
done
done
+ for xmlfile in $TARGET/*_*/abuild.xml; do
+ cat $xmlfile >> $REAL_XMLFILE
+ done
+ XMLFILE=$REAL_XMLFILE
fi
xml ''
+junit ''
+exit $failed