X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=0ed295ff1826319c6d87172d731d3194041ff156;hb=140a990a612e25a6d4974f696b9fa757e834d764;hp=d580cd86688c93b756a900f625d42221d4fbbdae;hpb=e7a30ee1663ebce8cfec3c2fb21eee8e1c1246a2;p=coreboot.git

diff --git a/util/abuild/abuild b/util/abuild/abuild
index d580cd866..0ed295ff1 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -35,6 +35,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 +109,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 +178,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>"
@@ -175,8 +192,9 @@ function create_config
 		echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> ${build_dir}/config.build
 		if [ "$PAYLOAD" != "/dev/null" ]; then
 			echo "# CONFIG_PAYLOAD_NONE is not set" >> ${build_dir}/config.build
+			echo "# CONFIG_PAYLOAD_SEABIOS is not set" >> ${build_dir}/config.build
 			echo "CONFIG_PAYLOAD_ELF=y" >> ${build_dir}/config.build
-			echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build
+			echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build
 		fi
 
 		if [ "$loglevel" != "default" ]; then
@@ -277,6 +295,7 @@ function compile_target
 	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
@@ -284,15 +303,22 @@ 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
 }
@@ -380,6 +406,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"
@@ -403,6 +432,8 @@ function build_target
 		xml "  <status>knownbroken</status>"
 		xml ""
 		xml "</mainboard>"
+		junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
+		junit "<failure type='KnownBroken'>Board is marked as broken</failure>"
 		return 0
 	}
 
@@ -427,6 +458,7 @@ function build_target
 
 	xml ""
 	xml "</mainboard>"
+	junit "</testcase>"
 
 	printf "\n"
 }
@@ -506,6 +538,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"
@@ -549,11 +583,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
 
@@ -565,6 +599,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;;
@@ -597,6 +632,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/`
@@ -605,6 +643,7 @@ 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
@@ -620,4 +659,6 @@ else
 	done
 fi
 xml '</abuild>'
+junit '</testsuite>'
 
+exit $failed