X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=74d2908e69f23870101a72b4cd88bae0bf91e4ea;hb=499fc926f8c877ab049f936fb9da7234e123edfb;hp=365bacd2e705a7de707f60bf1d11e8caf1fcc929;hpb=f1939bb29b15cb68e90c68ceda86d8d9ad20e746;p=coreboot.git

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 365bacd2e..74d2908e6 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 '<![CDATA[\n'
+		cat $1
+		printf ']]>\n'
+	} >> $XMLFILE
+}
 
 
 function vendors
@@ -161,7 +181,7 @@ function create_config
 	if [ "$CONFIG" != "" ]; then
 		printf "  Using existing configuration $CONFIG ... "
 		xml "  <config>$CONFIG</config>"
-		cp $CONFIG ${build_dir}/config.build
+		cp src/mainboard/$VENDOR/$MAINBOARD/$CONFIG ${build_dir}/config.build
 	else
 		printf "  Creating config file... "
 		xml "  <config>autogenerated</config>"
@@ -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 "  <buildtime>${duration}s</buildtime>"
+	junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' time='$duration' >"
 
 	xml "  <log>"
 	xmlfile make.log
@@ -285,27 +306,26 @@ function compile_target
 
 	if [ $ret -eq 0 ]; then
 		xml "  <compile>ok</compile>"
+		junit "<system-out>"
+		junitfile make.log
+		junit "</system-out>"
 		printf "ok\n" > compile.status
 		printf "ok. (took ${duration}s)\n"
 		cd $CURR
 		return 0
 	else
 		xml "  <compile>failed</compile>"
+		junit "<failure type='BuildFailed'>"
+		junitfile make.log
+		junit "</failure>"
 		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
 }
 
-function build_broken
-{
-	CURR=`pwd`
-	status="yes"
-	[ -r "$ROOT/src/mainboard/${VENDOR}/${MAINBOARD}/BROKEN" ] && status="no"
-	[ "$buildbroken" == "true" -o "$status" == "yes" ]
-}
-
 function build_target
 {
 	VENDOR=$1
@@ -338,6 +358,7 @@ function build_target
  	HOSTCC='gcc'
 
 	printf "Building $VENDOR/$MAINBOARD; "
+	XMLFILE=$TOP/$TARGET/${VENDOR}_${MAINBOARD}/abuild.xml
 
 	xml "<mainboard>"
 	xml ""
@@ -381,6 +402,9 @@ function build_target
 			xml ""
 			xml "</mainboard>"
 
+			junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
+			junit "<failure type='NoCrossCompiler'>No cross-compiler for $TARCH found</failure>"
+
 			return 0
 		else
 			printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n"
@@ -398,15 +422,6 @@ function build_target
 		CC="$CC -fno-stack-protector"
 	fi
 
-	build_broken $VENDOR $MAINBOARD || \
-	{
-		printf " ( broken mainboard/$VENDOR/$MAINBOARD skipped )\n\n"
-		xml "  <status>knownbroken</status>"
-		xml ""
-		xml "</mainboard>"
-		return 0
-	}
-
 	stime=`perl -e 'print time();' 2>/dev/null || date +%s`
 	create_buildenv $VENDOR $MAINBOARD $CONFIG
 	if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
@@ -428,6 +443,7 @@ function build_target
 
 	xml ""
 	xml "</mainboard>"
+	junit "</testcase>"
 
 	printf "\n"
 }
@@ -499,7 +515,6 @@ function myhelp
 	printf "Options:\n"
 	printf "    [-v|--verbose]		  print more messages\n"
 	printf "    [-a|--all]			  build previously succeeded ports as well\n"
-	printf "    [-b|--broken]		  attempt to build ports that are known broken\n"
 	printf "    [-r|--remove]                 remove output dir after build\n"
 	printf "    [-t|--target <vendor/board>]  attempt to build target vendor/board only\n"
 	printf "    [-p|--payloads <dir>]         use payloads in <dir> to build images\n"
@@ -507,6 +522,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 <numcpus>]         build on <numcpus> at the same time\n"
 	printf "    [-s|--silent]                 omit compiler calls in logs\n"
@@ -550,11 +567,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:,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:p: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,9 +583,9 @@ 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;;
 		-r|--remove)	shift; remove=true;;
 		-v|--verbose)	shift; verbose=true; silent='V=1';;
 		-V|--version)	shift; myversion; exit 0;;
@@ -590,6 +607,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 +619,9 @@ debug "ROOT=$ROOT"
 xml '<?xml version="1.0" encoding="utf-8"?>'
 xml '<abuild>'
 
+junit '<?xml version="1.0" encoding="utf-8"?>'
+junit '<testsuite>'
+
 if [ "$target" != "" ]; then
 	# build a single board
 	VENDOR=`printf $target|cut -f1 -d/`
@@ -606,10 +630,13 @@ if [ "$target" != "" ]; then
 	if [ ! -r $ROOT/src/mainboard/$target ]; then
 		printf "No such target: $target\n"
 		xml '</abuild>'
+		junit '</testsuite>'
 		exit 1
 	fi
 	build_target $VENDOR $MAINBOARD $CONFIG
 	test_target $VENDOR $MAINBOARD
+	test "$mode" != "text" && cat $TARGET/${VENDOR}_${MAINBOARD}/abuild.xml >> $REAL_XMLFILE
+	XMLFILE=$REAL_XMLFILE
 else
 	# build all boards per default
 	for VENDOR in $( vendors ); do
@@ -619,6 +646,14 @@ else
 			remove_target $VENDOR $MAINBOARD
 		done
 	done
+	if [ "$mode" != "text" ]; then
+		for xmlfile in $TARGET/*_*/abuild.xml; do
+			cat $xmlfile >> $REAL_XMLFILE
+		done
+	fi
+	XMLFILE=$REAL_XMLFILE
 fi
 xml '</abuild>'
+junit '</testsuite>'
 
+exit $failed