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

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 9601e83f5..0ed295ff1 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -14,8 +14,8 @@
 
 #set -x # Turn echo on....
 
-ABUILD_DATE="January 29th, 2010"
-ABUILD_VERSION="0.9"
+ABUILD_DATE="December 10th, 2010"
+ABUILD_VERSION="0.9.1"
 
 # Where shall we place all the build trees?
 TARGET=coreboot-builds
@@ -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
@@ -154,7 +171,6 @@ function create_config
 	fi
 
 	[ "$update" = "true" ] && mv ${build_dir}/coreboot.rom coreboot.rom.tmp
-	$MAKE distclean obj=${build_dir}
 	mkdir -p ${build_dir}
 	mkdir -p $TARGET/sharedutils
 	[ "$update" = "true" ] && mv coreboot.rom.tmp ${build_dir}/coreboot.rom
@@ -162,54 +178,53 @@ function create_config
 	if [ "$CONFIG" != "" ]; then
 		printf "  Using existing configuration $CONFIG ... "
 		xml "  <config>$CONFIG</config>"
-		cp $CONFIG .config
+		cp src/mainboard/$VENDOR/$MAINBOARD/$CONFIG ${build_dir}/config.build
 	else
 		printf "  Creating config file... "
 		xml "  <config>autogenerated</config>"
 		grep "if[\t ]*VENDOR" src/mainboard/$VENDOR/$MAINBOARD/../Kconfig | \
-			sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > .config
+			sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > ${build_dir}/config.build
 		grep "if[\t ]*BOARD" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
-			sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
+			sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
 		grep "select[\t ]*ARCH" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
-			sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
-		echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> .config
-		echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> .config
+			sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
+		echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> ${build_dir}/config.build
+		echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> ${build_dir}/config.build
 		if [ "$PAYLOAD" != "/dev/null" ]; then
-			echo "# CONFIG_PAYLOAD_NONE is not set" >> .config
-			echo "CONFIG_PAYLOAD_ELF=y" >> .config
-			echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> .config
+			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_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build
 		fi
 
 		if [ "$loglevel" != "default" ]; then
 			printf "(loglevel override) "
-			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
-			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> .config
-			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
-			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> .config
+			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
+			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
 		fi
 
 		if [ "$update" != "false" ]; then
 			printf "(update) "
-			echo "CONFIG_UPDATE_IMAGE=y" >> .config
+			echo "CONFIG_UPDATE_IMAGE=y" >> ${build_dir}/config.build
 		fi
 
 		if [ "$ccache" = "true" ]; then
 			printf "(ccache enabled) "
-			echo "CONFIG_CCACHE=y" >> .config
+			echo "CONFIG_CCACHE=y" >> ${build_dir}/config.build
 		fi
 
 		if [ "$scanbuild" = "true" ]; then
 			printf "(scan-build enabled) "
-			echo "CONFIG_SCANBUILD_ENABLE=y" >> .config
-			echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> .config
+			echo "CONFIG_SCANBUILD_ENABLE=y" >> ${build_dir}/config.build
+			echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> ${build_dir}/config.build
 		fi
-		echo "CONFIG_USBDEBUG=y" >> .config
 	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=$?
-	mv .config.old $TARGET/${VENDOR}_${MAINBOARD}/config.in
 	if [ $ret -eq 0 ]; then
 		printf "ok; "
 		xml "  <builddir>ok</builddir>"
@@ -242,13 +257,18 @@ function create_buildenv
 
 	# Allow simple "make" in the target directory
 	MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile
-	echo "# autogenerated makefile" > $MAKEFILE
+	echo "# autogenerated" > $MAKEFILE
 	echo "TOP=$ROOT" >> $MAKEFILE
-	echo "OUT=$TARGET/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+	echo "BUILD=$TARGET" >> $MAKEFILE
+	echo "OBJ=\$(BUILD)/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+	echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE
 	echo "all:" >> $MAKEFILE
-	echo "	cp config.build \$(TOP)/.config" >> $MAKEFILE
-	echo "	cd \$(TOP); \$(MAKE) oldconfig obj=\$(OUT)" >> $MAKEFILE
-	echo "	cd \$(TOP); \$(MAKE) obj=\$(OUT)" >> $MAKEFILE
+	echo "	@cp -a config.h config.h.bak" >> $MAKEFILE
+	echo "	@cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
+	echo "	@tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE
+	echo "	@cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE
+	echo "	@rm config.h.bak config.new config.old" >> $MAKEFILE
+	echo "	@cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
 
 	return $ret
 }
@@ -266,16 +286,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 obj=${build_dir} objutil=$TARGET/sharedutils \
+	eval $MAKE $silent -j $cpus DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \
 		&> ${build_dir}/make.log
 	ret=$?
-	mv .config ${build_dir}/config.build
 	mv .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
@@ -283,33 +303,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 built_successfully
-{
-	CURR=`pwd`
-	status="fail"
-	if [ -d "$TARGET/${VENDOR}_${MAINBOARD}" ]; then
-		cd $TARGET/${VENDOR}_${MAINBOARD}
-		if [ -r compile.status ] ; then
-			status=`cat compile.status`
-		fi
-		cd $CURR
-	fi
-	[ "$buildall" != "true" -a "$status" == "ok" ]
-}
-
 function build_broken
 {
 	CURR=`pwd`
@@ -393,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"
@@ -410,21 +426,14 @@ function build_target
 		CC="$CC -fno-stack-protector"
 	fi
 
-	built_successfully $VENDOR $MAINBOARD && test $update = "false" && \
-	{
-		printf " ( mainboard/$VENDOR/$MAINBOARD previously ok )\n\n"
-		xml "  <status>previouslyok</status>"
-		xml ""
-		xml "</mainboard>"
-		return 0
-	}
-
 	build_broken $VENDOR $MAINBOARD || \
 	{
 		printf " ( broken mainboard/$VENDOR/$MAINBOARD skipped )\n\n"
 		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
 	}
 
@@ -449,6 +458,7 @@ function build_target
 
 	xml ""
 	xml "</mainboard>"
+	junit "</testcase>"
 
 	printf "\n"
 }
@@ -528,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"
@@ -571,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
 
@@ -587,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;;
@@ -619,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/`
@@ -627,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
@@ -642,4 +659,6 @@ else
 	done
 fi
 xml '</abuild>'
+junit '</testsuite>'
 
+exit $failed